From cf7f411c093b57b8f52823411bcb624d76680c73 Mon Sep 17 00:00:00 2001 From: ozonexo3 Date: Fri, 6 Jul 2018 07:38:39 +0200 Subject: [PATCH] v0.602 --- .../GFX/EditorObjects/Materials/EmptyProp.mat | 82 ++ .../Materials/EmptyProp.mat.meta | 9 + Assets/GFX/Terrain/TerrainShader.mat | 4 +- Assets/MapEditor.unity | 888 +++++++++++++++++- Assets/Scripts/Common/EditorVersion.cs | 4 +- .../Scripts/OzoneDecalRenderer_OnPreRender.cs | 8 + .../GetGamedataFile/GetGamedataFile_Prop.cs | 23 +- .../GetGamedataFile/GetGamedataFile_Unit.cs | 2 +- .../Ozone SCMAP Code/Lua/SaveLua_Marker.cs | 77 +- .../Scripts/Ozone SCMAP Code/MapLuaParser.cs | 13 +- .../Scripts/Ozone SCMAP Code/ScmapEditor.cs | 3 +- Assets/Scripts/UI/Tools/AreaInfo.cs | 2 +- .../UI/Tools/Decals/DecalsControler.cs | 8 + Assets/Scripts/UI/Tools/Decals/DecalsInfo.cs | 21 +- .../UI/Tools/Decals/DecalsInfo_Selection.cs | 5 +- .../Scripts/UI/Tools/Decals/DecalsInfo_UI.cs | 16 + Assets/Scripts/UI/Tools/PropsInfo.cs | 2 + Assets/Scripts/UI/Tools/Stratum.meta | 8 + .../UI/Tools/{ => Stratum}/StratumInfo.cs | 112 +-- .../Tools/{ => Stratum}/StratumInfo.cs.meta | 0 .../UI/Tools/Stratum/StratumInfo_Order.cs | 77 ++ .../Tools/Stratum/StratumInfo_Order.cs.meta | 11 + Assets/Scripts/UI/Tools/Units/UnitsInfo.cs | 1 + Assets/Scripts/UI/Windows/NewMap.cs | 2 + .../Undo/HistoryObjects/HistoryAreaChange.cs | 10 +- .../Undo/HistoryObjects/HistoryMapInfo.cs | 1 + .../Undo/HistoryObjects/HistoryStep.cs | 15 - .../HistoryObjects/HistoryStratumChange.cs | 1 + .../HistoryObjects/HistoryStratumOrder.cs | 54 ++ ...ep.cs.meta => HistoryStratumOrder.cs.meta} | 4 +- .../HistoryObjects/HistoryStratumPaint.cs | 1 + ...ker => pathnode_air_10x10km.fafmapmarkers} | 0 ...ker => pathnode_air_20x20km.fafmapmarkers} | 0 ...arker => pathnode_air_5x5km.fafmapmarkers} | 0 34 files changed, 1222 insertions(+), 242 deletions(-) create mode 100644 Assets/GFX/EditorObjects/Materials/EmptyProp.mat create mode 100644 Assets/GFX/EditorObjects/Materials/EmptyProp.mat.meta create mode 100644 Assets/Scripts/UI/Tools/Stratum.meta rename Assets/Scripts/UI/Tools/{ => Stratum}/StratumInfo.cs (93%) rename Assets/Scripts/UI/Tools/{ => Stratum}/StratumInfo.cs.meta (100%) create mode 100644 Assets/Scripts/UI/Tools/Stratum/StratumInfo_Order.cs create mode 100644 Assets/Scripts/UI/Tools/Stratum/StratumInfo_Order.cs.meta delete mode 100644 Assets/Scripts/Undo/HistoryObjects/HistoryStep.cs create mode 100644 Assets/Scripts/Undo/HistoryObjects/HistoryStratumOrder.cs rename Assets/Scripts/Undo/HistoryObjects/{HistoryStep.cs.meta => HistoryStratumOrder.cs.meta} (76%) rename Structure/MarkerPresets/{pathnode_air_10x10km.fafmapmarker => pathnode_air_10x10km.fafmapmarkers} (100%) rename Structure/MarkerPresets/{pathnode_air_20x20km.fafmapmarker => pathnode_air_20x20km.fafmapmarkers} (100%) rename Structure/MarkerPresets/{pathnode_air_5x5km.fafmapmarker => pathnode_air_5x5km.fafmapmarkers} (100%) diff --git a/Assets/GFX/EditorObjects/Materials/EmptyProp.mat b/Assets/GFX/EditorObjects/Materials/EmptyProp.mat new file mode 100644 index 00000000..3dfda0a6 --- /dev/null +++ b/Assets/GFX/EditorObjects/Materials/EmptyProp.mat @@ -0,0 +1,82 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: EmptyProp + m_Shader: {fileID: 4800000, guid: 061c3e2210e96104f92ba84c2e025266, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Bump: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Clip: 0.5 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _GlowAlpha: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/GFX/EditorObjects/Materials/EmptyProp.mat.meta b/Assets/GFX/EditorObjects/Materials/EmptyProp.mat.meta new file mode 100644 index 00000000..cad92254 --- /dev/null +++ b/Assets/GFX/EditorObjects/Materials/EmptyProp.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 9c1501c902f369f46af3de859e898238 +timeCreated: 1500571268 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GFX/Terrain/TerrainShader.mat b/Assets/GFX/Terrain/TerrainShader.mat index e9452901..03f146ff 100644 --- a/Assets/GFX/Terrain/TerrainShader.mat +++ b/Assets/GFX/Terrain/TerrainShader.mat @@ -248,8 +248,8 @@ Material: - _Brush: 0 - _BrushPainting: 1 - _BrushSize: 0 - - _BrushUvX: 0.032142095 - - _BrushUvY: 0.3803858 + - _BrushUvX: 0.0109206615 + - _BrushUvY: 0.5623159 - _BuildGrid: 0 - _DeepLevel: 1.675625 - _DepthLevel: 1.5 diff --git a/Assets/MapEditor.unity b/Assets/MapEditor.unity index 3908ae3f..c031f0d9 100644 --- a/Assets/MapEditor.unity +++ b/Assets/MapEditor.unity @@ -12047,7 +12047,7 @@ Prefab: - target: {fileID: 224245749221985618, guid: b9c991c271c736249a3262b1b5a7d7d4, type: 2} propertyPath: m_RootOrder - value: 13 + value: 14 objectReference: {fileID: 0} - target: {fileID: 224245749221985618, guid: b9c991c271c736249a3262b1b5a7d7d4, type: 2} @@ -12057,7 +12057,7 @@ Prefab: - target: {fileID: 224245749221985618, guid: b9c991c271c736249a3262b1b5a7d7d4, type: 2} propertyPath: m_AnchoredPosition.y - value: -481 + value: -501 objectReference: {fileID: 0} - target: {fileID: 224245749221985618, guid: b9c991c271c736249a3262b1b5a7d7d4, type: 2} @@ -12574,6 +12574,37 @@ MonoBehaviour: TitleDescPrefab: {fileID: 2105485392} ArmyTooglePivot: {fileID: 2105995003} CustomTablesPivot: {fileID: 1982893595} +--- !u!84 &173196709 +RenderTexture: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 256 + m_Height: 256 + m_AntiAliasing: 1 + m_DepthFormat: 1 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 --- !u!1 &173528956 GameObject: m_ObjectHideFlags: 0 @@ -21745,6 +21776,7 @@ MonoBehaviour: NameInputField: {fileID: 1554188827} PrefixInputField: {fileID: 1287467229} UnitInstancePrefab: {fileID: 1017419612} + UnitMaterial: {fileID: 2100000, guid: 45d596c0e62a2ba44b276b336c2b1a8b, type: 2} NoUnitMesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} NoUnitMaterial: {fileID: 2100000, guid: b89d4bc1094219a4584f57bd36e00eea, type: 2} CreationPrefab: {fileID: 14478039} @@ -22165,7 +22197,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -28.099976, y: 9.399994} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &315926156 @@ -29390,6 +29422,100 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 401877978} +--- !u!1 &403338319 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 403338320} + - component: {fileID: 403338323} + - component: {fileID: 403338322} + - component: {fileID: 403338321} + m_Layer: 5 + m_Name: DecalData + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &403338320 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 403338319} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 493780889} + - {fileID: 1724922099} + - {fileID: 1555361327} + m_Father: {fileID: 943940804} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 11, y: 3} + m_SizeDelta: {x: 255.61, y: 62} + m_Pivot: {x: 0, y: 0} +--- !u!114 &403338321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 403338319} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 5 + m_Right: 5 + m_Top: 2 + m_Bottom: 2 + m_ChildAlignment: 0 + m_Spacing: 2 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 +--- !u!114 &403338322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 403338319} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.7058824} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 004fcd85e90bb654392361e14a461b0a, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &403338323 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 403338319} --- !u!1 &403978157 GameObject: m_ObjectHideFlags: 0 @@ -35294,6 +35420,95 @@ GameObject: Transform: m_PrefabParentObject: {fileID: 414254, guid: 67de491fe8610014aa40963e5f710d4f, type: 2} m_PrefabInternal: {fileID: 104175281} +--- !u!1 &493780888 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 493780889} + - component: {fileID: 493780892} + - component: {fileID: 493780891} + - component: {fileID: 493780890} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &493780889 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 493780888} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 403338320} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 127.805, y: -11} + m_SizeDelta: {x: 245.61, y: 18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &493780890 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 493780888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &493780891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 493780888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: ba878bb41b1a125448c85ae6644d5b6a, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Decal Statistics +--- !u!222 &493780892 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 493780888} --- !u!1 &496016668 GameObject: m_ObjectHideFlags: 0 @@ -39549,7 +39764,7 @@ Camera: serializedVersion: 2 m_Bits: 2560 m_RenderingPath: 1 - m_TargetTexture: {fileID: 1441693371} + m_TargetTexture: {fileID: 173196709} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 @@ -50783,6 +50998,8 @@ MonoBehaviour: TerrainMaterial: {fileID: 2100000, guid: 869424636fdf59642bae55582eca31d9, type: 2} PropMaterial: {fileID: 2100000, guid: 7e0dcd483a119b0439d572104f720f3f, type: 2} UnitMaterial: {fileID: 2100000, guid: 45d596c0e62a2ba44b276b336c2b1a8b, type: 2} + NoPropMesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} + NoPropMaterial: {fileID: 2100000, guid: 9c1501c902f369f46af3de859e898238, type: 2} Invert: 0 LoadingProps: 0 LoadedCount: 0 @@ -51797,7 +52014,7 @@ Prefab: - target: {fileID: 224654035474944384, guid: b68527975f2edce489c9336fa9650c39, type: 2} propertyPath: m_RootOrder - value: 16 + value: 17 objectReference: {fileID: 0} - target: {fileID: 224654035474944384, guid: b68527975f2edce489c9336fa9650c39, type: 2} @@ -51807,7 +52024,7 @@ Prefab: - target: {fileID: 224654035474944384, guid: b68527975f2edce489c9336fa9650c39, type: 2} propertyPath: m_AnchoredPosition.y - value: -560 + value: -580 objectReference: {fileID: 0} - target: {fileID: 224654035474944384, guid: b68527975f2edce489c9336fa9650c39, type: 2} @@ -59682,6 +59899,97 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 06b33172c38967643ac26a63c15d3e49, type: 3} m_IsPrefabParent: 0 +--- !u!1 &832420848 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 832420849} + - component: {fileID: 832420852} + - component: {fileID: 832420851} + - component: {fileID: 832420850} + m_Layer: 5 + m_Name: T + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &832420849 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 832420848} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1724922099} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -0.3499298} + m_SizeDelta: {x: 136, y: 22.7} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &832420850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 832420848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &832420851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 832420848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: ba878bb41b1a125448c85ae6644d5b6a, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 2 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: '0 + +' +--- !u!222 &832420852 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 832420848} --- !u!1 &833446794 GameObject: m_ObjectHideFlags: 0 @@ -68469,6 +68777,7 @@ RectTransform: m_Children: - {fileID: 1481677600} - {fileID: 1098290367} + - {fileID: 403338320} m_Father: {fileID: 2070241394} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -68525,6 +68834,8 @@ MonoBehaviour: DecalPrefab: {fileID: 1591655014} AlbedoMaterial: {fileID: 2100000, guid: ac566534eaa3de049af73f92da86e33b, type: 2} NormalMaterial: {fileID: 2100000, guid: 68cd48b7025dcbd4e99a21d916497bf6, type: 2} + DecalTotalCount: {fileID: 832420851} + DecalScreenCount: {fileID: 1827110849} LoadedCount: 0 DecalSettingsUi: {fileID: 1803570777} DecalsList: {fileID: 1250259515} @@ -73839,7 +74150,7 @@ Prefab: - target: {fileID: 224654035474944384, guid: b68527975f2edce489c9336fa9650c39, type: 2} propertyPath: m_RootOrder - value: 15 + value: 16 objectReference: {fileID: 0} - target: {fileID: 224654035474944384, guid: b68527975f2edce489c9336fa9650c39, type: 2} @@ -73849,7 +74160,7 @@ Prefab: - target: {fileID: 224654035474944384, guid: b68527975f2edce489c9336fa9650c39, type: 2} propertyPath: m_AnchoredPosition.y - value: -536 + value: -556 objectReference: {fileID: 0} - target: {fileID: 224654035474944384, guid: b68527975f2edce489c9336fa9650c39, type: 2} @@ -91688,6 +91999,7 @@ RectTransform: - {fileID: 1840659594} - {fileID: 188067454} - {fileID: 1327931669} + - {fileID: 2029462162} - {fileID: 1528030772} - {fileID: 1968845637} - {fileID: 165261789} @@ -91700,7 +92012,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 620} + m_SizeDelta: {x: 0, y: 640} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1264356797 MonoBehaviour: @@ -94160,6 +94472,80 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1314836769} +--- !u!1 &1315528963 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1315528964} + - component: {fileID: 1315528966} + - component: {fileID: 1315528965} + m_Layer: 5 + m_Name: T (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1315528964 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1315528963} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1724922099} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -178.7} + m_SizeDelta: {x: 136, y: 22.7} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1315528965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1315528963} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.047058824} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: ba878bb41b1a125448c85ae6644d5b6a, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 2 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 0123456789 +--- !u!222 &1315528966 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1315528963} --- !u!1 &1315616293 GameObject: m_ObjectHideFlags: 0 @@ -103510,37 +103896,6 @@ RectTransform: m_PrefabParentObject: {fileID: 224414395284792190, guid: 0cbe5a6c3afdfd147a4011b19eead070, type: 2} m_PrefabInternal: {fileID: 1439314567} ---- !u!84 &1441693371 -RenderTexture: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 256 - m_Height: 256 - m_AntiAliasing: 1 - m_DepthFormat: 1 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 --- !u!1 &1444107165 GameObject: m_ObjectHideFlags: 0 @@ -111208,6 +111563,96 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 363908738} m_Script: {fileID: 11500000, guid: 8c60df5520bfea740b1f3db0c3478272, type: 3} +--- !u!1 &1555361326 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1555361327} + - component: {fileID: 1555361330} + - component: {fileID: 1555361329} + - component: {fileID: 1555361328} + m_Layer: 5 + m_Name: TotalEnergy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1555361327 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1555361326} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1827110847} + m_Father: {fileID: 403338320} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 5, y: -42} + m_SizeDelta: {x: 245.61, y: 18} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1555361328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1555361326} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &1555361329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1555361326} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: ba878bb41b1a125448c85ae6644d5b6a, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'On screen: ' +--- !u!222 &1555361330 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1555361326} --- !u!1 &1555543385 GameObject: m_ObjectHideFlags: 0 @@ -122815,6 +123260,97 @@ RectTransform: m_AnchoredPosition: {x: -22.5, y: 0} m_SizeDelta: {x: 22, y: 22} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1724922098 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1724922099} + - component: {fileID: 1724922102} + - component: {fileID: 1724922101} + - component: {fileID: 1724922100} + m_Layer: 5 + m_Name: TotalMass + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1724922099 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1724922098} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 832420849} + - {fileID: 1315528964} + m_Father: {fileID: 403338320} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 5, y: -22} + m_SizeDelta: {x: 245.61, y: 18} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1724922100 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1724922098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &1724922101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1724922098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: ba878bb41b1a125448c85ae6644d5b6a, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Total: ' +--- !u!222 &1724922102 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1724922098} --- !u!1 &1726215206 GameObject: m_ObjectHideFlags: 0 @@ -128740,6 +129276,97 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1824311707} +--- !u!1 &1827110846 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1827110847} + - component: {fileID: 1827110850} + - component: {fileID: 1827110849} + - component: {fileID: 1827110848} + m_Layer: 5 + m_Name: S + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1827110847 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1827110846} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1555361327} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -0.34996414} + m_SizeDelta: {x: 136, y: 22.7} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1827110848 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1827110846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &1827110849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1827110846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: ba878bb41b1a125448c85ae6644d5b6a, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 2 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: '0 + +' +--- !u!222 &1827110850 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1827110846} --- !u!1 &1828583425 GameObject: m_ObjectHideFlags: 0 @@ -129122,7 +129749,7 @@ Prefab: - target: {fileID: 224512380592174650, guid: ae1ebc3d810ad1047ad52b2d8c562cde, type: 2} propertyPath: m_RootOrder - value: 14 + value: 15 objectReference: {fileID: 0} - target: {fileID: 224512380592174650, guid: ae1ebc3d810ad1047ad52b2d8c562cde, type: 2} @@ -129132,7 +129759,7 @@ Prefab: - target: {fileID: 224512380592174650, guid: ae1ebc3d810ad1047ad52b2d8c562cde, type: 2} propertyPath: m_AnchoredPosition.y - value: -488 + value: -508 objectReference: {fileID: 0} - target: {fileID: 224512380592174650, guid: ae1ebc3d810ad1047ad52b2d8c562cde, type: 2} @@ -138438,6 +139065,11 @@ Prefab: m_Modification: m_TransformParent: {fileID: 1264356796} m_Modifications: + - target: {fileID: 114621995600585708, guid: 0cbe5a6c3afdfd147a4011b19eead070, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224414395284792190, guid: 0cbe5a6c3afdfd147a4011b19eead070, type: 2} propertyPath: m_LocalPosition.x @@ -138476,7 +139108,7 @@ Prefab: - target: {fileID: 224414395284792190, guid: 0cbe5a6c3afdfd147a4011b19eead070, type: 2} propertyPath: m_RootOrder - value: 12 + value: 13 objectReference: {fileID: 0} - target: {fileID: 224414395284792190, guid: 0cbe5a6c3afdfd147a4011b19eead070, type: 2} @@ -138486,7 +139118,7 @@ Prefab: - target: {fileID: 224414395284792190, guid: 0cbe5a6c3afdfd147a4011b19eead070, type: 2} propertyPath: m_AnchoredPosition.y - value: -454 + value: -474 objectReference: {fileID: 0} - target: {fileID: 224414395284792190, guid: 0cbe5a6c3afdfd147a4011b19eead070, type: 2} @@ -138552,6 +139184,31 @@ Prefab: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 5 objectReference: {fileID: 0} + - target: {fileID: 114621995600585708, guid: 0cbe5a6c3afdfd147a4011b19eead070, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 114621995600585708, guid: 0cbe5a6c3afdfd147a4011b19eead070, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument + value: NoRushOffset + objectReference: {fileID: 0} + - target: {fileID: 114621995600585708, guid: 0cbe5a6c3afdfd147a4011b19eead070, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114621995600585708, guid: 0cbe5a6c3afdfd147a4011b19eead070, + type: 2} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114621995600585708, guid: 0cbe5a6c3afdfd147a4011b19eead070, + type: 2} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 0cbe5a6c3afdfd147a4011b19eead070, type: 2} m_IsPrefabParent: 0 @@ -142333,6 +142990,145 @@ RectTransform: m_PrefabParentObject: {fileID: 224512380592174650, guid: ae1ebc3d810ad1047ad52b2d8c562cde, type: 2} m_PrefabInternal: {fileID: 475751639} +--- !u!1001 &2029462161 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1264356796} + m_Modifications: + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_AnchoredPosition.x + value: 139.85 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_AnchoredPosition.y + value: -438 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_SizeDelta.x + value: 279.7 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_SizeDelta.y + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1452221188716340, guid: a8b16c59651bdaa41b0c9659190bc740, type: 2} + propertyPath: m_Name + value: BoldLabel (1) + objectReference: {fileID: 0} + - target: {fileID: 114551542520024562, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_Text + value: Remember to set slots Odd/Even + objectReference: {fileID: 0} + - target: {fileID: 114551542520024562, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114551542520024562, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_Color.g + value: 0.45255437 + objectReference: {fileID: 0} + - target: {fileID: 114551542520024562, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_Color.b + value: 0.2783019 + objectReference: {fileID: 0} + - target: {fileID: 114758551227994310, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_PreferredHeight + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 114551542520024562, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + propertyPath: m_FontData.m_Alignment + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: a8b16c59651bdaa41b0c9659190bc740, type: 2} + m_IsPrefabParent: 0 +--- !u!224 &2029462162 stripped +RectTransform: + m_PrefabParentObject: {fileID: 224037365456051264, guid: a8b16c59651bdaa41b0c9659190bc740, + type: 2} + m_PrefabInternal: {fileID: 2029462161} --- !u!1 &2030033409 GameObject: m_ObjectHideFlags: 0 @@ -148619,7 +149415,7 @@ Prefab: - target: {fileID: 224414395284792190, guid: 0cbe5a6c3afdfd147a4011b19eead070, type: 2} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 224414395284792190, guid: 0cbe5a6c3afdfd147a4011b19eead070, type: 2} @@ -148629,7 +149425,7 @@ Prefab: - target: {fileID: 224414395284792190, guid: 0cbe5a6c3afdfd147a4011b19eead070, type: 2} propertyPath: m_AnchoredPosition.y - value: -430 + value: -450 objectReference: {fileID: 0} - target: {fileID: 224414395284792190, guid: 0cbe5a6c3afdfd147a4011b19eead070, type: 2} diff --git a/Assets/Scripts/Common/EditorVersion.cs b/Assets/Scripts/Common/EditorVersion.cs index b55da474..5c04552a 100644 --- a/Assets/Scripts/Common/EditorVersion.cs +++ b/Assets/Scripts/Common/EditorVersion.cs @@ -7,8 +7,8 @@ public class EditorVersion : MonoBehaviour { public const string EditorBuildVersion = "v0.602-Alpha"; - //public const float VersionOffset = 0f; // Release - public const float VersionOffset = -0.001f; // Prerelease + public const float VersionOffset = 0f; // Release + //public const float VersionOffset = -0.001f; // Prerelease //public const float VersionOffset = 0.523f - 0.600f; // Prerelease v0600 public static string LatestTag = ""; public static string FoundUrl; diff --git a/Assets/Scripts/GFX/OzoneDecals/Scripts/OzoneDecalRenderer_OnPreRender.cs b/Assets/Scripts/GFX/OzoneDecals/Scripts/OzoneDecalRenderer_OnPreRender.cs index a06d390e..bc35c44f 100644 --- a/Assets/Scripts/GFX/OzoneDecals/Scripts/OzoneDecalRenderer_OnPreRender.cs +++ b/Assets/Scripts/GFX/OzoneDecals/Scripts/OzoneDecalRenderer_OnPreRender.cs @@ -29,6 +29,13 @@ private void RenderForCamera(Camera cam) return; #endif + + if (DecalsInfo.Current) + { + int ScreenDecalsCount = _DecalsAlbedo.Count + _Decals.Count; + DecalsInfo.Current.UpdateScreenCount(ScreenDecalsCount); + } + if (_Decals.Count == 0 && _DecalsAlbedo.Count == 0) return; @@ -41,6 +48,7 @@ private void RenderForCamera(Camera cam) DrawDeferredDecals_Albedo(cam); DrawDeferredDecals_Normal(cam); + // Clear var decalEnum = _Decals.GetEnumerator(); while (decalEnum.MoveNext()) diff --git a/Assets/Scripts/Ozone SCMAP Code/GetGamedataFile/GetGamedataFile_Prop.cs b/Assets/Scripts/Ozone SCMAP Code/GetGamedataFile/GetGamedataFile_Prop.cs index a644a3e1..6eec8ed1 100644 --- a/Assets/Scripts/Ozone SCMAP Code/GetGamedataFile/GetGamedataFile_Prop.cs +++ b/Assets/Scripts/Ozone SCMAP Code/GetGamedataFile/GetGamedataFile_Prop.cs @@ -305,10 +305,6 @@ public static PropObject LoadProp(string scd, string LocalPath) } } - ToReturn.BP.LocalScale = Vector3.one * (ToReturn.BP.UniformScale * 0.1f); - - - for (int i = 0; i < ToReturn.BP.LODs.Length; i++) { ToReturn.BP.LODs[i].Mesh = LoadModel(scd, ToReturn.BP.LODs[i].Scm); @@ -366,9 +362,28 @@ public static PropObject LoadProp(string scd, string LocalPath) ToReturn.BP.LODs[i].Normal.anisoLevel = 2; ToReturn.BP.LODs[i].Mat.SetTexture("_BumpMap", ToReturn.BP.LODs[i].Normal); } + } + if(ToReturn.BP.LODs.Length <= 0){ + ToReturn.BP.LODs = new BluePrintLoD[1]; + ToReturn.BP.LODs[0].LODCutoff = 100; + } + if (ToReturn.BP.LODs[0].Mesh == null) + { + ToReturn.BP.LODs[0].Mesh = PropsInfo.Current.NoPropMesh; + ToReturn.BP.UniformScale = 0.5f; } + if (ToReturn.BP.LODs[0].Mat == null) + ToReturn.BP.LODs[0].Mat = PropsInfo.Current.NoPropMaterial; + + if (ToReturn.BP.UniformScale <= 0.01f) + ToReturn.BP.UniformScale = 0.01f; + + ToReturn.BP.LocalScale = Vector3.one * (ToReturn.BP.UniformScale * 0.1f); + + + LoadedPropObjects.Add(LocalPath, ToReturn); return ToReturn; diff --git a/Assets/Scripts/Ozone SCMAP Code/GetGamedataFile/GetGamedataFile_Unit.cs b/Assets/Scripts/Ozone SCMAP Code/GetGamedataFile/GetGamedataFile_Unit.cs index 0b912e88..62b69764 100644 --- a/Assets/Scripts/Ozone SCMAP Code/GetGamedataFile/GetGamedataFile_Unit.cs +++ b/Assets/Scripts/Ozone SCMAP Code/GetGamedataFile/GetGamedataFile_Unit.cs @@ -356,7 +356,7 @@ public static UnitSource LoadUnit(string scd, string LocalPath) ToReturn.BP.LODs[i].Mesh = UnitsInfo.Current.NoUnitMesh; //ToReturn.BP.LODs[i].Mat = new Material(Shader.Find("Standard (Specular setup)")); - ToReturn.BP.LODs[i].Mat = new Material(EditMap.PropsInfo.Current.UnitMaterial); + ToReturn.BP.LODs[i].Mat = new Material(UnitsInfo.Current.UnitMaterial); ToReturn.BP.LODs[i].Mat.name = ToReturn.BP.CodeName + "_LOD" + i + " mat"; diff --git a/Assets/Scripts/Ozone SCMAP Code/Lua/SaveLua_Marker.cs b/Assets/Scripts/Ozone SCMAP Code/Lua/SaveLua_Marker.cs index c1449495..ce41103b 100644 --- a/Assets/Scripts/Ozone SCMAP Code/Lua/SaveLua_Marker.cs +++ b/Assets/Scripts/Ozone SCMAP Code/Lua/SaveLua_Marker.cs @@ -116,6 +116,7 @@ public enum MarkerTypes Island, WeatherGenerator, WeatherDefinition, Effect, + NavalExclude, Count } @@ -139,31 +140,40 @@ public static string MarkerTypeToString(MarkerTypes MType) public bool AllowByType(string Key) { - if (MarkerType == MarkerTypes.Mass) - return Key == KEY_SIZE || Key == KEY_RESOURCE || Key == KEY_AMOUNT || Key == KEY_EDITORICON; - else if (MarkerType == MarkerTypes.Hydrocarbon) - return Key == KEY_SIZE || Key == KEY_RESOURCE || Key == KEY_AMOUNT; - else if (MarkerType == MarkerTypes.BlankMarker) - return false; - else if (MarkerType == MarkerTypes.LandPathNode || MarkerType == MarkerTypes.AirPathNode || MarkerType == MarkerTypes.WaterPathNode || MarkerType == MarkerTypes.AmphibiousPathNode || MarkerType == MarkerTypes.AutoPathNode) - return Key == KEY_HINT || Key == KEY_GRAPH || Key == KEY_ADJACENTTO; - else if (MarkerType == MarkerTypes.NavalLink) - return false; - else if (MarkerType == MarkerTypes.TransportMarker) - return false; - else if (MarkerType == MarkerTypes.CameraInfo) - return Key == KEY_ZOOM || Key == KEY_CANSETCAMERA || Key == KEY_CANSYNCCAMERA; - else if (MarkerType == MarkerTypes.Effect) - return Key == KEY_OFFSET || Key == KEY_EFFECTTEMPLATE || Key == KEY_COLOR || Key == KEY_SCALE; - else if (MarkerType == MarkerTypes.WeatherGenerator) - return Key == KEY_CLOUDCOUNT || Key == KEY_CLOUDEMITTERSCALE || Key == KEY_CLOUDEMITTERSCALERANGE || Key == KEY_CLOUDCOUNTRANGE || Key == KEY_CLOUDSPREAD || Key == KEY_CLOUDHEIGHTRANGE - || Key == KEY_SPAWNCHANCE || Key == KEY_FORCETYPE || Key == KEY_CLOUDHEIGHT; - else if (MarkerType == MarkerTypes.WeatherDefinition) - return Key == KEY_WEATHERDRIFTDIRECTION || Key == KEY_MAPSTYLE - || Key == KEY_WEATHERTYPE01 || Key == KEY_WEATHERTYPE02 || Key == KEY_WEATHERTYPE03 || Key == KEY_WEATHERTYPE04 - || Key == KEY_WEATHERTYPE01CHANCE || Key == KEY_WEATHERTYPE02CHANCE || Key == KEY_WEATHERTYPE03CHANCE || Key == KEY_WEATHERTYPE04CHANCE; - else //Unknown - return Key == KEY_HINT; + switch (MarkerType) + { + case MarkerTypes.Mass: + return Key == KEY_SIZE || Key == KEY_RESOURCE || Key == KEY_AMOUNT || Key == KEY_EDITORICON; + case MarkerTypes.Hydrocarbon: + return Key == KEY_SIZE || Key == KEY_RESOURCE || Key == KEY_AMOUNT; + case MarkerTypes.BlankMarker: + return false; + case MarkerTypes.LandPathNode: + case MarkerTypes.AirPathNode: + case MarkerTypes.WaterPathNode: + case MarkerTypes.AmphibiousPathNode: + case MarkerTypes.AutoPathNode: + return Key == KEY_HINT || Key == KEY_GRAPH || Key == KEY_ADJACENTTO; + case MarkerTypes.NavalLink: + return false; + case MarkerTypes.NavalExclude: + return Key == KEY_HINT; + case MarkerTypes.TransportMarker: + return false; + case MarkerTypes.CameraInfo: + return Key == KEY_ZOOM || Key == KEY_CANSETCAMERA || Key == KEY_CANSYNCCAMERA; + case MarkerTypes.Effect: + return Key == KEY_OFFSET || Key == KEY_EFFECTTEMPLATE || Key == KEY_COLOR || Key == KEY_SCALE; + case MarkerTypes.WeatherGenerator: + return Key == KEY_CLOUDCOUNT || Key == KEY_CLOUDEMITTERSCALE || Key == KEY_CLOUDEMITTERSCALERANGE || Key == KEY_CLOUDCOUNTRANGE || Key == KEY_CLOUDSPREAD || Key == KEY_CLOUDHEIGHTRANGE + || Key == KEY_SPAWNCHANCE || Key == KEY_FORCETYPE || Key == KEY_CLOUDHEIGHT; + case MarkerTypes.WeatherDefinition: + return Key == KEY_WEATHERDRIFTDIRECTION || Key == KEY_MAPSTYLE + || Key == KEY_WEATHERTYPE01 || Key == KEY_WEATHERTYPE02 || Key == KEY_WEATHERTYPE03 || Key == KEY_WEATHERTYPE04 + || Key == KEY_WEATHERTYPE01CHANCE || Key == KEY_WEATHERTYPE02CHANCE || Key == KEY_WEATHERTYPE03CHANCE || Key == KEY_WEATHERTYPE04CHANCE; + default: + return Key == KEY_HINT; + } } void DefaultsByType() @@ -272,6 +282,11 @@ void DefaultsByType() hint = false; color = "ffff0000"; break; + case MarkerTypes.NavalExclude: + prop = "/env/common/props/markers/M_CombatZone_prop.bp"; + hint = true; + color = "ff0000AA"; + break; case MarkerTypes.TransportMarker: prop = "/env/common/props/markers/M_Blank_prop.bp"; hint = false; @@ -317,7 +332,7 @@ public void ForceDefaultValues() orientation = Vector3.zero; color = "ff008000"; } - else if(MarkerType == MarkerTypes.CameraInfo) + else if (MarkerType == MarkerTypes.CameraInfo) { } @@ -609,7 +624,7 @@ public void SaveMarkerValues(LuaParser.Creator LuaFile) if (AutoMarker_Amphibious.AdjacentToMarker[i].AutoMarker_Amphibious != null) AutoMarker_Amphibious.AdjacentToMarker[i] = AutoMarker_Amphibious.AdjacentToMarker[i].AutoMarker_Amphibious; else - { + { AutoMarker_Amphibious.AdjacentToMarker.RemoveAt(i); i--; } @@ -623,7 +638,7 @@ public void SaveMarkerValues(LuaParser.Creator LuaFile) if (MarkerObj != null) { position = ScmapEditor.WorldPosToScmap(MarkerObj.transform.position); - if(MarkerType != MarkerTypes.CameraInfo) + if (MarkerType != MarkerTypes.CameraInfo) MarkerObj.transform.localRotation = Quaternion.identity; orientation = MarkerObj.transform.eulerAngles; } @@ -800,7 +815,7 @@ public static SaveLua.Marker GetMarker(string Name) public static bool MarkerExist(string Name, bool WithObject = true) { - if(WithObject) + if (WithObject) return AllMarkersDictionary.ContainsKey(Name) && AllMarkersDictionary[Name].MarkerObj != null; return AllMarkersDictionary.ContainsKey(Name); @@ -812,7 +827,7 @@ public static string GetLowestName(Marker.MarkerTypes Type) string prefix = ""; if (Type == Marker.MarkerTypes.BlankMarker || Type == Marker.MarkerTypes.Mass || Type == Marker.MarkerTypes.Hydrocarbon) prefix = Marker.MarkerTypeToString(Type) + " "; - else if(Type == Marker.MarkerTypes.LandPathNode) + else if (Type == Marker.MarkerTypes.LandPathNode) { prefix = "LandPN"; } @@ -889,7 +904,7 @@ public void GenerateAutoMarkers() int Mcount = Data.MasterChains[mc].Markers.Count; for (int m = 0; m < Mcount; m++) { - if(Data.MasterChains[mc].Markers[m].MarkerType == Marker.MarkerTypes.AutoPathNode) + if (Data.MasterChains[mc].Markers[m].MarkerType == Marker.MarkerTypes.AutoPathNode) { if (Data.MasterChains[mc].Markers[m].IsOnWater()) { diff --git a/Assets/Scripts/Ozone SCMAP Code/MapLuaParser.cs b/Assets/Scripts/Ozone SCMAP Code/MapLuaParser.cs index 07d055c7..f6ba59a7 100644 --- a/Assets/Scripts/Ozone SCMAP Code/MapLuaParser.cs +++ b/Assets/Scripts/Ozone SCMAP Code/MapLuaParser.cs @@ -338,15 +338,12 @@ IEnumerator LoadingFile() //Map Loaded } - // Fix map version - if (FolderName.Contains(".v")) - { - int ParsedValue = (int)ScenarioLuaFile.Data.map_version; - if (int.TryParse(FolderName.Remove(0, FolderName.Length - 4), out ParsedValue)) - { - ScenarioLuaFile.Data.map_version = ParsedValue; - } + int ParsedVersionValue = AppMenu.GetVersionControll(FolderName); + + if(ParsedVersionValue > 0) + { + ScenarioLuaFile.Data.map_version = ParsedVersionValue; } diff --git a/Assets/Scripts/Ozone SCMAP Code/ScmapEditor.cs b/Assets/Scripts/Ozone SCMAP Code/ScmapEditor.cs index a8f49fa2..2f694550 100644 --- a/Assets/Scripts/Ozone SCMAP Code/ScmapEditor.cs +++ b/Assets/Scripts/Ozone SCMAP Code/ScmapEditor.cs @@ -670,13 +670,12 @@ public void SaveScmapFile() if (MapLuaParser.Current.EditMenu.MapInfoMenu.SaveAsFa.isOn) { - if(map.AdditionalSkyboxData.Data.Position.x == 0) + if(map.AdditionalSkyboxData == null || map.AdditionalSkyboxData.Data == null || map.AdditionalSkyboxData.Data.Position.x == 0) { LoadDefaultSkybox(); } map.VersionMinor = 60; - map.AdditionalSkyboxData.Data.UpdateSize(); } else if(map.VersionMinor >= 60) diff --git a/Assets/Scripts/UI/Tools/AreaInfo.cs b/Assets/Scripts/UI/Tools/AreaInfo.cs index e9d40d10..dfa383a7 100644 --- a/Assets/Scripts/UI/Tools/AreaInfo.cs +++ b/Assets/Scripts/UI/Tools/AreaInfo.cs @@ -148,7 +148,7 @@ public void SelectArea(int InstanceID) #region UI public void OnValuesChange(int instanceID) { - Undo.RegisterUndo(new UndoHistory.HistoryAreaChange(), new UndoHistory.HistoryAreaChange.AreaChangeHistoryParameter(MapLuaParser.Current.SaveLuaFile.Data.areas[instanceID])); + Undo.RegisterUndo(new UndoHistory.HistoryAreaChange(), new UndoHistory.HistoryAreaChange.AreaChangeParam(MapLuaParser.Current.SaveLuaFile.Data.areas[instanceID])); MapLuaParser.Current.SaveLuaFile.Data.areas[instanceID].Name = Created[instanceID].Name.text; diff --git a/Assets/Scripts/UI/Tools/Decals/DecalsControler.cs b/Assets/Scripts/UI/Tools/Decals/DecalsControler.cs index 35a0c941..fac2e1af 100644 --- a/Assets/Scripts/UI/Tools/Decals/DecalsControler.cs +++ b/Assets/Scripts/UI/Tools/Decals/DecalsControler.cs @@ -15,6 +15,14 @@ private void Awake() Current = this; } + public static int DecalCount + { + get + { + return Current.AllDecals.Count; + } + } + public static List GetAllDecals() { int Count = Current.AllDecals.Count; diff --git a/Assets/Scripts/UI/Tools/Decals/DecalsInfo.cs b/Assets/Scripts/UI/Tools/Decals/DecalsInfo.cs index 5bfabba9..abac9698 100644 --- a/Assets/Scripts/UI/Tools/Decals/DecalsInfo.cs +++ b/Assets/Scripts/UI/Tools/Decals/DecalsInfo.cs @@ -17,6 +17,9 @@ public partial class DecalsInfo : MonoBehaviour public Material AlbedoMaterial; public Material NormalMaterial; + public Text DecalTotalCount; + public Text DecalScreenCount; + public class PropTypeGroup { public string Blueprint = ""; @@ -63,24 +66,6 @@ public IEnumerator LoadDecals() { CreateGameObjectFromDecal(ScmapEditor.Current.map.Decals[i]); - /* - GameObject NewDecalObject = Instantiate(DecalPrefab, DecalPivot); - OzoneDecal Dec = NewDecalObject.GetComponent(); - Decal Component = ScmapEditor.Current.map.Decals[i]; - Dec.Dec = Component; - Dec.tr = NewDecalObject.transform; - - Dec.tr.localRotation = Quaternion.Euler(Component.Rotation * Mathf.Rad2Deg); - Dec.tr.localScale = new Vector3(Component.Scale.x * 0.1f, Component.Scale.x * 0.1f, Component.Scale.z * 0.1f); - - Dec.CutOffLOD = Component.CutOffLOD; - Dec.NearCutOffLOD = Component.NearCutOffLOD; - - Dec.MovePivotPoint(ScmapEditor.ScmapPosToWorld(Component.Position)); - - Dec.Material = Component.Shared.SharedMaterial; - */ - if (ScmapEditor.Current.map.Decals[i].Type != TerrainDecalType.TYPE_ALBEDO && ScmapEditor.Current.map.Decals[i].Type != TerrainDecalType.TYPE_NORMALS && ScmapEditor.Current.map.Decals[i].Type != TerrainDecalType.TYPE_NORMALS_ALPHA && ScmapEditor.Current.map.Decals[i].Type != TerrainDecalType.TYPE_GLOW && ScmapEditor.Current.map.Decals[i].Type != TerrainDecalType.TYPE_GLOW_MASK) diff --git a/Assets/Scripts/UI/Tools/Decals/DecalsInfo_Selection.cs b/Assets/Scripts/UI/Tools/Decals/DecalsInfo_Selection.cs index c69743a9..8533dd41 100644 --- a/Assets/Scripts/UI/Tools/Decals/DecalsInfo_Selection.cs +++ b/Assets/Scripts/UI/Tools/Decals/DecalsInfo_Selection.cs @@ -55,7 +55,7 @@ public void GoToSelection() if (ChangeControlerType.Current) ChangeControlerType.Current.UpdateButtons(); - //MarkerSelectionOptions.UpdateOptions(); + UpdateTotalCount(); } @@ -83,7 +83,7 @@ public void DestroyDetails(List MarkerObjects, bool RegisterUndo = t SelectionManager.Current.CleanSelection(); GoToSelection(); - + UpdateTotalCount(); } public void Place(Vector3[] Positions, Quaternion[] Rotations, Vector3[] Scales) @@ -115,6 +115,7 @@ public void Place(Vector3[] Positions, Quaternion[] Rotations, Vector3[] Scales) DecalsControler.AddDecal(Obj.Dec); } + UpdateTotalCount(); } diff --git a/Assets/Scripts/UI/Tools/Decals/DecalsInfo_UI.cs b/Assets/Scripts/UI/Tools/Decals/DecalsInfo_UI.cs index 540b3b5c..585d2ee6 100644 --- a/Assets/Scripts/UI/Tools/Decals/DecalsInfo_UI.cs +++ b/Assets/Scripts/UI/Tools/Decals/DecalsInfo_UI.cs @@ -167,6 +167,22 @@ public HashSet SelectedDecals } } + public void UpdateTotalCount() + { + DecalTotalCount.text = DecalsControler.DecalCount.ToString(); + } + + int LastDecalScreenCount = 0; + public void UpdateScreenCount(int count) + { + if (count != LastDecalScreenCount) + { + LastDecalScreenCount = count; + DecalScreenCount.text = count.ToString(); + + } + } + public void CreateNewDecalType() { //TODO Undo Create diff --git a/Assets/Scripts/UI/Tools/PropsInfo.cs b/Assets/Scripts/UI/Tools/PropsInfo.cs index e4ed022c..68e961da 100644 --- a/Assets/Scripts/UI/Tools/PropsInfo.cs +++ b/Assets/Scripts/UI/Tools/PropsInfo.cs @@ -43,6 +43,8 @@ public class PropsInfo : MonoBehaviour public Material TerrainMaterial; public Material PropMaterial; public Material UnitMaterial; + public Mesh NoPropMesh; + public Material NoPropMaterial; float TotalMassCount = 0; float TotalEnergyCount = 0; diff --git a/Assets/Scripts/UI/Tools/Stratum.meta b/Assets/Scripts/UI/Tools/Stratum.meta new file mode 100644 index 00000000..1ad41b1c --- /dev/null +++ b/Assets/Scripts/UI/Tools/Stratum.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e5149be329772c443b4249fa56f76bb5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Tools/StratumInfo.cs b/Assets/Scripts/UI/Tools/Stratum/StratumInfo.cs similarity index 93% rename from Assets/Scripts/UI/Tools/StratumInfo.cs rename to Assets/Scripts/UI/Tools/Stratum/StratumInfo.cs index 5138e4f2..4c5b9e4e 100644 --- a/Assets/Scripts/UI/Tools/StratumInfo.cs +++ b/Assets/Scripts/UI/Tools/Stratum/StratumInfo.cs @@ -12,7 +12,7 @@ namespace EditMap { - public class StratumInfo : MonoBehaviour + public partial class StratumInfo : MonoBehaviour { public StratumSettingsUi StratumSettings; @@ -427,6 +427,8 @@ public void ChangePageToSettings() int LastRotation = 0; bool StratumChangeCheck = false; + bool StratumMenuUndoRegistered = false; + public void UpdateStratumMenu(bool Slider = false) { if (!gameObject.activeSelf) @@ -439,8 +441,11 @@ public void UpdateStratumMenu(bool Slider = false) if (!StratumChangeCheck) { StratumChangeCheck = true; - if (!LoadingStratum) + if (!LoadingStratum && !StratumMenuUndoRegistered) + { Undo.RegisterUndo(new UndoHistory.HistoryStratumChange(), new UndoHistory.HistoryStratumChange.StratumChangeHistoryParameter(Selected)); + StratumMenuUndoRegistered = true; + } } if (!LoadingStratum) { @@ -448,10 +453,11 @@ public void UpdateStratumMenu(bool Slider = false) } else { - if (!LoadingStratum) + if (!LoadingStratum && !StratumMenuUndoRegistered) { Undo.RegisterUndo(new UndoHistory.HistoryStratumChange(), new UndoHistory.HistoryStratumChange.StratumChangeHistoryParameter(Selected)); } + StratumMenuUndoRegistered = false; } if (!LoadingStratum) { @@ -988,107 +994,7 @@ void SetChannelByLayer(int layer, ref Color color, float channel) #endregion #region Reorder - public void MoveSelectedUp() - { - if (Selected <= 0 || Selected >= 8) - return; - - int NewSelected = Selected + 1; - - Color[] StratumData = GetPixels(Selected); - - if (Selected == 4) - { // Different tex - Color[] StratumDataPrev = GetPixels(NewSelected); - - - for (int i = 0; i < StratumData.Length; i++) - { - float from = GetChannelByLayer(NewSelected, StratumDataPrev[i]); - SetChannelByLayer(NewSelected, ref StratumDataPrev[i], GetChannelByLayer(Selected, StratumData[i])); - SetChannelByLayer(Selected, ref StratumData[i], from); - } - - - SetPixels(Selected, StratumData); - SetPixels(NewSelected, StratumDataPrev); - } - else - { // Same - for (int i = 0; i < StratumData.Length; i++) - { - float from = GetChannelByLayer(NewSelected, StratumData[i]); - SetChannelByLayer(NewSelected, ref StratumData[i], GetChannelByLayer(Selected, StratumData[i])); - SetChannelByLayer(Selected, ref StratumData[i], from); - } - - - SetPixels(NewSelected, StratumData); - - } - - - ScmapEditor.TerrainTexture Prev = ScmapEditor.Current.Textures[Selected]; - ScmapEditor.Current.Textures[Selected] = ScmapEditor.Current.Textures[NewSelected]; - ScmapEditor.Current.Textures[NewSelected] = Prev; - - ScmapEditor.Current.SetTextures(Selected); - ScmapEditor.Current.SetTextures(NewSelected); - - ReloadStratums(); - SelectStratum(NewSelected); - } - - public void MoveSelectedDown() - { - if (Selected <= 1 || Selected >= 9) - return; - - int NewSelected = Selected - 1; - - Color[] StratumData = GetPixels(Selected); - if(Selected == 5) - { // Different tex - Color[] StratumDataPrev = GetPixels(NewSelected); - - - for (int i = 0; i < StratumData.Length; i++) - { - float from = GetChannelByLayer(NewSelected, StratumDataPrev[i]); - SetChannelByLayer(NewSelected, ref StratumDataPrev[i], GetChannelByLayer(Selected, StratumData[i])); - SetChannelByLayer(Selected, ref StratumData[i], from); - } - - - SetPixels(Selected, StratumData); - SetPixels(NewSelected, StratumDataPrev); - } - else - { // Same - for(int i = 0; i < StratumData.Length; i++) - { - float from = GetChannelByLayer(NewSelected, StratumData[i]); - SetChannelByLayer(NewSelected, ref StratumData[i], GetChannelByLayer(Selected, StratumData[i])); - SetChannelByLayer(Selected, ref StratumData[i], from); - } - - - SetPixels(NewSelected, StratumData); - - } - - - ScmapEditor.TerrainTexture Prev = ScmapEditor.Current.Textures[Selected]; - ScmapEditor.Current.Textures[Selected] = ScmapEditor.Current.Textures[NewSelected]; - ScmapEditor.Current.Textures[NewSelected] = Prev; - - ScmapEditor.Current.SetTextures(Selected); - ScmapEditor.Current.SetTextures(NewSelected); - - ReloadStratums(); - SelectStratum(NewSelected); - } #endregion diff --git a/Assets/Scripts/UI/Tools/StratumInfo.cs.meta b/Assets/Scripts/UI/Tools/Stratum/StratumInfo.cs.meta similarity index 100% rename from Assets/Scripts/UI/Tools/StratumInfo.cs.meta rename to Assets/Scripts/UI/Tools/Stratum/StratumInfo.cs.meta diff --git a/Assets/Scripts/UI/Tools/Stratum/StratumInfo_Order.cs b/Assets/Scripts/UI/Tools/Stratum/StratumInfo_Order.cs new file mode 100644 index 00000000..797caa1c --- /dev/null +++ b/Assets/Scripts/UI/Tools/Stratum/StratumInfo_Order.cs @@ -0,0 +1,77 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace EditMap +{ + public partial class StratumInfo : MonoBehaviour + { + + + public void MoveSelectedUp() + { + if (Selected <= 0 || Selected >= 8) + return; + + int NewSelected = Selected + 1; + + Undo.RegisterUndo(new UndoHistory.HistoryStratumReorder(), new UndoHistory.HistoryStratumReorder.StratumReorderParam(Selected, NewSelected)); + + SwitchLayers(Selected, NewSelected); + } + + public void MoveSelectedDown() + { + if (Selected <= 1 || Selected >= 9) + return; + + int NewSelected = Selected - 1; + + Undo.RegisterUndo(new UndoHistory.HistoryStratumReorder(), new UndoHistory.HistoryStratumReorder.StratumReorderParam(Selected, NewSelected)); + + SwitchLayers(Selected, NewSelected); + } + + public void SwitchLayers(int FromLayer, int ToLayer) + { + Color[] StratumData = GetPixels(FromLayer); + + if (FromLayer > 4 != ToLayer > 4) + { // Different tex + Color[] StratumDataPrev = GetPixels(ToLayer); + + for (int i = 0; i < StratumData.Length; i++) + { + float from = GetChannelByLayer(ToLayer, StratumDataPrev[i]); + SetChannelByLayer(ToLayer, ref StratumDataPrev[i], GetChannelByLayer(FromLayer, StratumData[i])); + SetChannelByLayer(FromLayer, ref StratumData[i], from); + } + + + SetPixels(FromLayer, StratumData); + SetPixels(ToLayer, StratumDataPrev); + } + else + { // Same + for (int i = 0; i < StratumData.Length; i++) + { + float from = GetChannelByLayer(ToLayer, StratumData[i]); + SetChannelByLayer(ToLayer, ref StratumData[i], GetChannelByLayer(FromLayer, StratumData[i])); + SetChannelByLayer(FromLayer, ref StratumData[i], from); + } + + SetPixels(ToLayer, StratumData); + } + + ScmapEditor.TerrainTexture Prev = ScmapEditor.Current.Textures[FromLayer]; + ScmapEditor.Current.Textures[FromLayer] = ScmapEditor.Current.Textures[ToLayer]; + ScmapEditor.Current.Textures[ToLayer] = Prev; + + ScmapEditor.Current.SetTextures(FromLayer); + ScmapEditor.Current.SetTextures(ToLayer); + + ReloadStratums(); + SelectStratum(ToLayer); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Tools/Stratum/StratumInfo_Order.cs.meta b/Assets/Scripts/UI/Tools/Stratum/StratumInfo_Order.cs.meta new file mode 100644 index 00000000..4ea8cf97 --- /dev/null +++ b/Assets/Scripts/UI/Tools/Stratum/StratumInfo_Order.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b1f2156b941463a4abf5b12bc86f63b5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Tools/Units/UnitsInfo.cs b/Assets/Scripts/UI/Tools/Units/UnitsInfo.cs index 6689e161..f733beea 100644 --- a/Assets/Scripts/UI/Tools/Units/UnitsInfo.cs +++ b/Assets/Scripts/UI/Tools/Units/UnitsInfo.cs @@ -26,6 +26,7 @@ public partial class UnitsInfo : MonoBehaviour [Header("Objects")] public GameObject UnitInstancePrefab; + public Material UnitMaterial; public Mesh NoUnitMesh; public Material NoUnitMaterial; diff --git a/Assets/Scripts/UI/Windows/NewMap.cs b/Assets/Scripts/UI/Windows/NewMap.cs index 12d1535a..b8bed555 100644 --- a/Assets/Scripts/UI/Windows/NewMap.cs +++ b/Assets/Scripts/UI/Windows/NewMap.cs @@ -207,12 +207,14 @@ IEnumerator CreateFiles() } + ScmapEditor.Current.map = new Map(MapLuaParser.Current.ScenarioLuaFile.Data.Size[0], MapLuaParser.Current.ScenarioLuaFile.Data.Size[1], InitialHeight.intValue, Water.isOn, WaterElv.intValue, DepthElevation.intValue, AbyssElevation.intValue); //GenerateControlTex.GenerateWater(); ScmapEditor.Current.LoadHeights(); + MapLuaParser.Current.EditMenu.MapInfoMenu.SaveAsFa.isOn = false; MapLuaParser.Current.EditMenu.TexturesMenu.TTerrainXP.isOn = true; yield return new WaitForSeconds(0.5f); diff --git a/Assets/Scripts/Undo/HistoryObjects/HistoryAreaChange.cs b/Assets/Scripts/Undo/HistoryObjects/HistoryAreaChange.cs index 87b8d94f..5c9d3a01 100644 --- a/Assets/Scripts/Undo/HistoryObjects/HistoryAreaChange.cs +++ b/Assets/Scripts/Undo/HistoryObjects/HistoryAreaChange.cs @@ -11,12 +11,12 @@ namespace UndoHistory public class HistoryAreaChange : HistoryObject { - private AreaChangeHistoryParameter parameter; - public class AreaChangeHistoryParameter : HistoryParameter + private AreaChangeParam parameter; + public class AreaChangeParam : HistoryParameter { public MapLua.SaveLua.Areas Area; - public AreaChangeHistoryParameter(MapLua.SaveLua.Areas Area) + public AreaChangeParam(MapLua.SaveLua.Areas Area) { this.Area = Area; } @@ -32,7 +32,7 @@ public AreaChangeHistoryParameter(MapLua.SaveLua.Areas Area) public override void Register(HistoryParameter Param) { - parameter = Param as AreaChangeHistoryParameter; + parameter = Param as AreaChangeParam; Area = parameter.Area; Name = Area.Name; X = Area.rectangle.x; @@ -46,7 +46,7 @@ public override void Register(HistoryParameter Param) public override void DoUndo() { if (!RedoGenerated) - Undo.RegisterRedo(new HistoryAreaChange(), new AreaChangeHistoryParameter(Area)); + Undo.RegisterRedo(new HistoryAreaChange(), new AreaChangeParam(Area)); RedoGenerated = true; DoRedo(); } diff --git a/Assets/Scripts/Undo/HistoryObjects/HistoryMapInfo.cs b/Assets/Scripts/Undo/HistoryObjects/HistoryMapInfo.cs index 888b6d97..35516b38 100644 --- a/Assets/Scripts/Undo/HistoryObjects/HistoryMapInfo.cs +++ b/Assets/Scripts/Undo/HistoryObjects/HistoryMapInfo.cs @@ -15,6 +15,7 @@ public class HistoryMapInfo : HistoryObject public override void Register(HistoryParameter Param) { + UndoCommandName = "Map settings"; Name = MapLuaParser.Current.ScenarioLuaFile.Data.name; Desc = MapLuaParser.Current.ScenarioLuaFile.Data.description; Version = MapLuaParser.Current.ScenarioLuaFile.Data.map_version; diff --git a/Assets/Scripts/Undo/HistoryObjects/HistoryStep.cs b/Assets/Scripts/Undo/HistoryObjects/HistoryStep.cs deleted file mode 100644 index 62ad93d5..00000000 --- a/Assets/Scripts/Undo/HistoryObjects/HistoryStep.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UnityEngine; -using System.Collections; -using UndoHistory; -using EditMap; - -public class HistoryStep : MonoBehaviour { - - public virtual void Register(){ - - } - - public virtual void DoUndo(int UndoTo){ - - } -} diff --git a/Assets/Scripts/Undo/HistoryObjects/HistoryStratumChange.cs b/Assets/Scripts/Undo/HistoryObjects/HistoryStratumChange.cs index 6ec0b5d9..e8a39971 100644 --- a/Assets/Scripts/Undo/HistoryObjects/HistoryStratumChange.cs +++ b/Assets/Scripts/Undo/HistoryObjects/HistoryStratumChange.cs @@ -27,6 +27,7 @@ public StratumChangeHistoryParameter(int StratumId) public override void Register(HistoryParameter Param) { + UndoCommandName = "Stratum change"; parameter = (Param as StratumChangeHistoryParameter); Textures = new ScmapEditor.TerrainTexture(); diff --git a/Assets/Scripts/Undo/HistoryObjects/HistoryStratumOrder.cs b/Assets/Scripts/Undo/HistoryObjects/HistoryStratumOrder.cs new file mode 100644 index 00000000..09557b44 --- /dev/null +++ b/Assets/Scripts/Undo/HistoryObjects/HistoryStratumOrder.cs @@ -0,0 +1,54 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; +using EditMap; + +namespace UndoHistory +{ + public class HistoryStratumReorder : HistoryObject + { + + + private StratumReorderParam parameter; + public class StratumReorderParam : HistoryParameter + { + public int FromId; + public int ToId; + + public StratumReorderParam(int FromId, int ToId) + { + this.FromId = FromId; + this.ToId = ToId; + } + } + + + public override void Register(HistoryParameter Param) + { + UndoCommandName = "Reorder layers"; + parameter = (Param as StratumReorderParam); + } + + + public override void DoUndo() + { + if (!RedoGenerated) + Undo.RegisterRedo(new HistoryStratumReorder(), new StratumReorderParam(parameter.FromId, parameter.ToId)); + RedoGenerated = true; + DoRedo(); + } + + public override void DoRedo() + { + if (Undo.Current.EditMenu.State != Editing.EditStates.TexturesStat) + { + Undo.Current.EditMenu.State = Editing.EditStates.TexturesStat; + Undo.Current.EditMenu.ChangeCategory(2); + } + + Undo.Current.EditMenu.EditStratum.SwitchLayers(parameter.ToId, parameter.FromId); + + + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Undo/HistoryObjects/HistoryStep.cs.meta b/Assets/Scripts/Undo/HistoryObjects/HistoryStratumOrder.cs.meta similarity index 76% rename from Assets/Scripts/Undo/HistoryObjects/HistoryStep.cs.meta rename to Assets/Scripts/Undo/HistoryObjects/HistoryStratumOrder.cs.meta index 883fbb80..505770c5 100644 --- a/Assets/Scripts/Undo/HistoryObjects/HistoryStep.cs.meta +++ b/Assets/Scripts/Undo/HistoryObjects/HistoryStratumOrder.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 5e009e0f958e92842b63964eaf8b8f1d -timeCreated: 1478889403 +guid: b58b3a7be6376fe4cb176d15e10ec2ed +timeCreated: 1478895647 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Undo/HistoryObjects/HistoryStratumPaint.cs b/Assets/Scripts/Undo/HistoryObjects/HistoryStratumPaint.cs index c25b987b..058fe576 100644 --- a/Assets/Scripts/Undo/HistoryObjects/HistoryStratumPaint.cs +++ b/Assets/Scripts/Undo/HistoryObjects/HistoryStratumPaint.cs @@ -26,6 +26,7 @@ public StratumPaintHistoryParameter(int StratumId, Color[] Stratum) public override void Register(HistoryParameter Param) { + UndoCommandName = "Stratum paint"; parameter = (Param as StratumPaintHistoryParameter); Colors = new Color[parameter.Stratum.Length]; diff --git a/Structure/MarkerPresets/pathnode_air_10x10km.fafmapmarker b/Structure/MarkerPresets/pathnode_air_10x10km.fafmapmarkers similarity index 100% rename from Structure/MarkerPresets/pathnode_air_10x10km.fafmapmarker rename to Structure/MarkerPresets/pathnode_air_10x10km.fafmapmarkers diff --git a/Structure/MarkerPresets/pathnode_air_20x20km.fafmapmarker b/Structure/MarkerPresets/pathnode_air_20x20km.fafmapmarkers similarity index 100% rename from Structure/MarkerPresets/pathnode_air_20x20km.fafmapmarker rename to Structure/MarkerPresets/pathnode_air_20x20km.fafmapmarkers diff --git a/Structure/MarkerPresets/pathnode_air_5x5km.fafmapmarker b/Structure/MarkerPresets/pathnode_air_5x5km.fafmapmarkers similarity index 100% rename from Structure/MarkerPresets/pathnode_air_5x5km.fafmapmarker rename to Structure/MarkerPresets/pathnode_air_5x5km.fafmapmarkers