diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/WaitTimeCardBullet.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/WaitTimeCardBullet.prefab index b0be9e1a..3421d5c9 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/WaitTimeCardBullet.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/WaitTimeCardBullet.prefab @@ -9768,8 +9768,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 2 m_RenderMode: 0 m_MeshDistribution: 0 @@ -14665,8 +14665,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 100 m_RenderMode: 0 m_MeshDistribution: 0 @@ -19571,8 +19571,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 0 m_RenderMode: 0 m_MeshDistribution: 0 @@ -34235,8 +34235,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: -1 m_RenderMode: 0 m_MeshDistribution: 0 @@ -39132,8 +39132,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 0 m_RenderMode: 0 m_MeshDistribution: 0 @@ -48917,8 +48917,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 100 m_RenderMode: 0 m_MeshDistribution: 0 @@ -58801,8 +58801,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 5 m_RenderMode: 0 m_MeshDistribution: 0 @@ -68613,8 +68613,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: -1 m_RenderMode: 0 m_MeshDistribution: 0 @@ -73528,8 +73528,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 0 m_RenderMode: 0 m_MeshDistribution: 0 @@ -83340,8 +83340,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 0 m_RenderMode: 0 m_MeshDistribution: 0 @@ -93143,8 +93143,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: -1 m_RenderMode: 0 m_MeshDistribution: 0 @@ -117655,8 +117655,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 1 m_RenderMode: 0 m_MeshDistribution: 0 @@ -122589,8 +122589,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 5 m_RenderMode: 5 m_MeshDistribution: 0 @@ -132410,8 +132410,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 10 m_RenderMode: 0 m_MeshDistribution: 0 @@ -137307,8 +137307,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 1 m_RenderMode: 4 m_MeshDistribution: 0 @@ -152016,8 +152016,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: -1 m_RenderMode: 0 m_MeshDistribution: 0 @@ -156913,8 +156913,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 0 m_RenderMode: 0 m_MeshDistribution: 0 @@ -176587,8 +176587,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 5 m_RenderMode: 0 m_MeshDistribution: 0 @@ -191296,8 +191296,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 1 m_RenderMode: 0 m_MeshDistribution: 0 @@ -206014,8 +206014,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 0 m_RenderMode: 0 m_MeshDistribution: 0 @@ -225656,8 +225656,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 0 m_RenderMode: 1 m_MeshDistribution: 0 @@ -230638,8 +230638,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 0 m_RenderMode: 4 m_MeshDistribution: 0 @@ -235535,8 +235535,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 10 m_RenderMode: 0 m_MeshDistribution: 0 @@ -240441,8 +240441,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 10 m_RenderMode: 0 m_MeshDistribution: 0 @@ -245298,8 +245298,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 0 m_RenderMode: 1 m_MeshDistribution: 0 @@ -264828,8 +264828,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 5 m_RenderMode: 5 m_MeshDistribution: 0 @@ -274622,8 +274622,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 10 m_RenderMode: 0 m_MeshDistribution: 0 @@ -284448,8 +284448,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 100 m_RenderMode: 0 m_MeshDistribution: 0 @@ -289345,8 +289345,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 0 m_RenderMode: 0 m_MeshDistribution: 0 @@ -294242,8 +294242,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 1 m_RenderMode: 0 m_MeshDistribution: 0 @@ -299148,8 +299148,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 2 m_RenderMode: 0 m_MeshDistribution: 0 @@ -304045,8 +304045,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 100 m_RenderMode: 0 m_MeshDistribution: 0 @@ -308960,8 +308960,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1889724801 + m_SortingLayer: 7 m_SortingOrder: 0 m_RenderMode: 4 m_MeshDistribution: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab index dc3a4160..ae5bee57 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab @@ -866,7 +866,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 991 + m_Text: 994 --- !u!1 &4939717426418636302 GameObject: m_ObjectHideFlags: 0 @@ -1375,7 +1375,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 0 - m_FillAmount: 0.991 + m_FillAmount: 0.994 m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 3f36ca01..cde33e6d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -7007,14 +7007,17 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1485211134} - {fileID: 485490295} + - {fileID: 1485211134} - {fileID: 1076314299} - {fileID: 734247258} - {fileID: 1848107656} - {fileID: 1833978458} + - {fileID: 1527341456} - {fileID: 712893801} + - {fileID: 1103931664} - {fileID: 144591442} + - {fileID: 814223558} m_Father: {fileID: 1293189437} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -9401,6 +9404,85 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: attack: 10001 +--- !u!1 &463084152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 463084153} + - component: {fileID: 463084155} + - component: {fileID: 463084154} + m_Layer: 5 + m_Name: TextPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &463084153 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463084152} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000061035156} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1485211134} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.00012207031, y: -0.000006198883} + m_SizeDelta: {x: 160, y: 414} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &463084154 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463084152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 65 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 65 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &463084155 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463084152} + m_CullTransparentMesh: 1 --- !u!1 &464618902 GameObject: m_ObjectHideFlags: 0 @@ -10383,17 +10465,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 485490294} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000061035156} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0002746582} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1949698720} + - {fileID: 1960888998} m_Father: {fileID: 345108945} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00012207031, y: 0} + m_AnchoredPosition: {x: -0.00030517578, y: 0.00045013428} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &485490296 @@ -10421,7 +10504,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 0 - m_FillAmount: 0 + m_FillAmount: 1 m_FillClockwise: 0 m_FillOrigin: 0 m_UseSpriteMesh: 0 @@ -15204,7 +15287,7 @@ GameObject: - component: {fileID: 712893803} - component: {fileID: 712893802} m_Layer: 5 - m_Name: MiddleFloorsNumberText + m_Name: WhiteFloorsNumberText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -15586,17 +15669,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 734247257} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000061035156} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00012207031} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 187381992} + - {fileID: 1901154657} m_Father: {fileID: 345108945} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00012207031, y: 0} + m_AnchoredPosition: {x: -0.00012207031, y: -0.00005340576} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &734247259 @@ -17267,6 +17351,85 @@ RectTransform: m_AnchoredPosition: {x: 291, y: 28.66517} m_SizeDelta: {x: 70.7, y: 57.65} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &814223557 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 814223558} + - component: {fileID: 814223560} + - component: {fileID: 814223559} + m_Layer: 5 + m_Name: EnemyFloorsNumberTextPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &814223558 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 814223557} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 345108945} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 853.98, y: 0} + m_SizeDelta: {x: 208.04, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &814223559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 814223557} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 65 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 30 +--- !u!222 &814223560 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 814223557} + m_CullTransparentMesh: 1 --- !u!1 &816979500 GameObject: m_ObjectHideFlags: 0 @@ -21603,6 +21766,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051341099} m_CullTransparentMesh: 1 +--- !u!1 &1053031169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1053031170} + - component: {fileID: 1053031172} + - component: {fileID: 1053031171} + m_Layer: 5 + m_Name: TextPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1053031170 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1053031169} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000061035156} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1076314299} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.00012207031, y: -0.000006198883} + m_SizeDelta: {x: 160, y: 414} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1053031171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1053031169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 65 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 65 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1053031172 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1053031169} + m_CullTransparentMesh: 1 --- !u!1 &1055460322 GameObject: m_ObjectHideFlags: 0 @@ -21936,17 +22178,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1076314298} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000061035156} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00012207031} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 845052670} + - {fileID: 1053031170} m_Father: {fileID: 345108945} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00012207031, y: 0} + m_AnchoredPosition: {x: -0.00018310547, y: 0.00012207031} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1076314300 @@ -22596,6 +22839,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1100687150} m_CullTransparentMesh: 1 +--- !u!1 &1103931663 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1103931664} + - component: {fileID: 1103931666} + - component: {fileID: 1103931665} + m_Layer: 5 + m_Name: WhiteFloorsNumberTextPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1103931664 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1103931663} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 345108945} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 345.64, y: 0} + m_SizeDelta: {x: 199.36, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1103931665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1103931663} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 65 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 30 +--- !u!222 &1103931666 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1103931663} + m_CullTransparentMesh: 1 --- !u!1 &1108322115 GameObject: m_ObjectHideFlags: 0 @@ -26267,6 +26589,7 @@ MonoBehaviour: Green: {fileID: 734247259} Bule: {fileID: 1076314300} Black: {fileID: 485490296} + White: {fileID: 1485211135} redText: {fileID: 615570243} greenText: {fileID: 187381993} blueText: {fileID: 845052671} @@ -26274,7 +26597,7 @@ MonoBehaviour: whiteText: {fileID: 1451146637} sumPlayerText: {fileID: 1833978459} sumMiddleText: {fileID: 712893802} - sumEnemyText: {fileID: 144591443} + sumRightText: {fileID: 144591443} sunImage: {fileID: 1313982822} barBox: {fileID: 345108945} lastSunColor: white @@ -26285,6 +26608,14 @@ MonoBehaviour: blueSun: {fileID: -281758944, guid: 382995de68f3ca248ac9203a043b9fa0, type: 3} blackSun: {fileID: 1805441527, guid: f4b07260ff13fa449a46460fe998d9f0, type: 3} sunSpeed: 2 + redTextPre: {fileID: 2065864442} + greenTextPre: {fileID: 1901154658} + blueTextPre: {fileID: 1053031171} + blackTextPre: {fileID: 1960888999} + whiteTextPre: {fileID: 463084154} + sumPlayerTextPre: {fileID: 1527341457} + sumMiddleTextPre: {fileID: 1103931665} + sumRightTextPre: {fileID: 814223559} sunAnim: {fileID: 1313982821} cardRewardsRarityAdjustment: 0 cardRewardsCounter: 0 @@ -26292,6 +26623,8 @@ MonoBehaviour: mainCamera: {fileID: 330585545} colseCamera: {fileID: 699857786} farCamera: {fileID: 1180006399} + currentCardEntity: {fileID: 0} + currentMapNode: {fileID: 0} --- !u!4 &1285317928 Transform: m_ObjectHideFlags: 0 @@ -29664,17 +29997,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1485211133} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000061035156} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00012207031} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1451146636} + - {fileID: 463084153} m_Father: {fileID: 345108945} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00012207031, y: 0} + m_AnchoredPosition: {x: -0.00012207031, y: 0.000022888184} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1485211135 @@ -30644,6 +30978,85 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1 &1527341455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1527341456} + - component: {fileID: 1527341458} + - component: {fileID: 1527341457} + m_Layer: 5 + m_Name: PlayerFloorsNumberTextPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1527341456 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1527341455} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 345108945} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -167.42, y: 0} + m_SizeDelta: {x: 196.64, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1527341457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1527341455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 65 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: (+10) +--- !u!222 &1527341458 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1527341455} + m_CullTransparentMesh: 1 --- !u!1 &1528011283 GameObject: m_ObjectHideFlags: 0 @@ -42016,7 +42429,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -302, y: 0} + m_AnchoredPosition: {x: -300, y: 0} m_SizeDelta: {x: 100.28, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1833978459 @@ -42486,17 +42899,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1848107655} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.000061035156} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00012207031} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 615570242} + - {fileID: 2065864441} m_Father: {fileID: 345108945} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00012207031, y: 0} + m_AnchoredPosition: {x: -0.00018310547, y: 0.00012207031} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1848107657 @@ -43416,6 +43830,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1891178116} m_CullTransparentMesh: 1 +--- !u!1 &1901154656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1901154657} + - component: {fileID: 1901154659} + - component: {fileID: 1901154658} + m_Layer: 5 + m_Name: TextPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1901154657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901154656} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000061035156} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 734247258} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.00012207031, y: -0.000006198883} + m_SizeDelta: {x: 160, y: 414} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1901154658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901154656} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 65 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 65 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1901154659 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901154656} + m_CullTransparentMesh: 1 --- !u!1 &1903492752 GameObject: m_ObjectHideFlags: 0 @@ -44434,6 +44927,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1958493896} m_CullTransparentMesh: 1 +--- !u!1 &1960888997 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1960888998} + - component: {fileID: 1960889000} + - component: {fileID: 1960888999} + m_Layer: 5 + m_Name: TextPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1960888998 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1960888997} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0002746582} + m_LocalScale: {x: 0.9997714, y: 0.99977154, z: 0.99977154} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 485490295} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.000061035156, y: -0.000006198883} + m_SizeDelta: {x: 160, y: 414} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1960888999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1960888997} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 65 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 65 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1960889000 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1960888997} + m_CullTransparentMesh: 1 --- !u!1 &1961912543 GameObject: m_ObjectHideFlags: 0 @@ -46194,6 +46766,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2061957033} m_CullTransparentMesh: 1 +--- !u!1 &2065864440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2065864441} + - component: {fileID: 2065864443} + - component: {fileID: 2065864442} + m_Layer: 5 + m_Name: TextPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2065864441 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2065864440} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000061035156} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1848107656} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.00012207031, y: -0.000006198883} + m_SizeDelta: {x: 160, y: 414} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2065864442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2065864440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 65 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 65 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &2065864443 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2065864440} + m_CullTransparentMesh: 1 --- !u!1 &2067364250 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs index 7c0317e3..31881f83 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs @@ -426,7 +426,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag { //射线检测瞄准的地图节点,判断是否可放置和改变放置影响区 Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value); - Debug.Log(Mouse.current.position.value); + // Debug.Log(Mouse.current.position.value); if (Physics.Raycast(ray, out RaycastHit raycastHit, 500, layerMask.value)) { //Debug.Log(raycastHit.collider.gameObject.name); @@ -440,6 +440,9 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag cardEntity.influencePreviewPool.Clear(); currentNode = raycastHit.collider.transform.GetComponent(); + //注册拖拽卡牌信息 + GameManager.Instance.currentCardEntity = cardEntity; + GameManager .Instance .currentMapNode = currentNode; //重新调用范围预览 //GameManager.Instance.player.StepPreviewInfluencedNode(cardEntity.cardOriginalData.CastingRange); int castRange = cardEntity.cardOriginalData.CastingRange; @@ -464,6 +467,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag //更新效果作用范围内怪物虚血 EnemyManager.Instance.ShowExpHp_Observer(cardEntity.influencePreviewPool); + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/UI/ExpHpFlash.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/UI/ExpHpFlash.cs index 76482311..2eb59832 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/UI/ExpHpFlash.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/UI/ExpHpFlash.cs @@ -7,6 +7,14 @@ using UnityEngine.UI; public class ExpHpFlash : MonoBehaviour { public Image image; + public Text text; + public UItype uItype; + public enum UItype + { + imageUI, + textUI + } + public Color white; public Color black; public Color originColor; @@ -32,6 +40,13 @@ public class ExpHpFlash : MonoBehaviour dir = true; } - image.color = Vector4.Lerp(black, white, time); + if(uItype == UItype.imageUI ) + { + image.color = Vector4.Lerp(black, white, time); + } + else + { + text.color = Vector4.Lerp(black, white, time); + } } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs index 50824761..689b41b7 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs @@ -56,7 +56,8 @@ public class GameManager : Singleton public Image Red; public Image Green; public Image Bule; - public Image Black; + public Image Black; + public Image White; [Header("场地颜色分度盘文字")] public Text redText; public Text greenText; @@ -65,7 +66,7 @@ public class GameManager : Singleton public Text whiteText; public Text sumPlayerText; public Text sumMiddleText; - public Text sumEnemyText; + public Text sumRightText; [Header("场地颜色优势框")] public Image sunImage; public RectTransform barBox;//总框体大小 @@ -83,6 +84,15 @@ public class GameManager : Singleton float greenNodeCountLatest; float whiteNodeCountLatest; float blackNodeCountLatest; + [Header("场地颜色分度盘文字预览")] + public Text redTextPre; + public Text greenTextPre; + public Text blueTextPre; + public Text blackTextPre; + public Text whiteTextPre; + public Text sumPlayerTextPre; + public Text sumMiddleTextPre; + public Text sumRightTextPre; [Header("太阳动画")] public Animator sunAnim; @@ -96,7 +106,10 @@ public class GameManager : Singleton [Header("虚拟像机")] public GameObject colseCamera; public GameObject farCamera; - + [Header("当前玩家拖拽的卡牌")] + public CardEntity currentCardEntity; + [Header("当前玩家拖拽的卡牌选中的地块")] + public MapUnity currentMapNode; private void Start() { //生成空地图列表 @@ -211,46 +224,175 @@ public class GameManager : Singleton redNodeCountLatest = Mathf.Lerp(redNodeCountLatest, redNodeCount, Time.deltaTime * sunSpeed); blueNodeCountLatest = Mathf.Lerp(blueNodeCountLatest, blueNodeCount, Time.deltaTime * sunSpeed); greenNodeCountLatest = Mathf.Lerp(greenNodeCountLatest, greenNodeCount, Time.deltaTime * sunSpeed); - // float currentWhiteNodeCount = Mathf.Lerp(whiteNodeCountLatest, whiteNodeCount, Time.deltaTime * sunSpeed); - blackNodeCountLatest = Mathf.Lerp(blackNodeCountLatest, blackNodeCount, Time.deltaTime * sunSpeed); - - float totoalNode = redNodeCount + blueNodeCount + greenNodeCount + whiteNodeCount + blackNodeCount; - //颜色 - Red.fillAmount = redNodeCountLatest / totoalNode; - Green.fillAmount = Red.fillAmount + greenNodeCountLatest / totoalNode; - Bule.fillAmount = Green.fillAmount + blueNodeCountLatest / totoalNode; - Black.fillAmount = Bule.fillAmount + blackNodeCountLatest / totoalNode; + // float currentWhiteNodeCount = Mathf.Lerp(whiteNodeCountLatest, whiteNodeCount, Time.deltaTime * sunSpeed); + whiteNodeCountLatest = Mathf.Lerp(whiteNodeCountLatest, whiteNodeCount, Time.deltaTime * sunSpeed); + //blackNodeCountLatest = Mathf.Lerp(blackNodeCountLatest, blackNodeCount, Time.deltaTime * sunSpeed); //文字 redText.text = redNodeCount.ToString(); if (redNodeCount == 0) - redText.text = " "; + redText.text = " "; greenText.text = greenNodeCount.ToString(); if (greenNodeCount == 0) - greenText.text = " "; - blueText .text = blueNodeCount.ToString(); + greenText.text = " "; + blueText.text = blueNodeCount.ToString(); if (blueNodeCount == 0) blueText.text = " "; - blackText .text = blackNodeCount.ToString(); + blackText.text = blackNodeCount.ToString(); if (blackNodeCount == 0) blackText.text = " "; whiteText.text = whiteNodeCount.ToString(); if (whiteNodeCount == 0) - whiteText.text = " "; + whiteText.text = " "; sumPlayerText.text = (redNodeCount + blueNodeCount + greenNodeCount).ToString(); sumMiddleText.text = whiteNodeCount.ToString(); - sumEnemyText.text = blackNodeCount.ToString(); + sumRightText.text = blackNodeCount.ToString(); + float totoalNode = redNodeCount + blueNodeCount + greenNodeCount + whiteNodeCount + blackNodeCount; + //颜色 + Red.fillAmount = redNodeCountLatest / totoalNode; + Green.fillAmount = Red.fillAmount + greenNodeCountLatest / totoalNode; + Bule.fillAmount = Green.fillAmount + blueNodeCountLatest / totoalNode; + White.fillAmount = Bule.fillAmount + whiteNodeCountLatest / totoalNode; + // Black.fillAmount = Bule.fillAmount + blackNodeCountLatest / totoalNode; + //预览涂色 + if (onDrag && currentCardEntity != null && currentMapNode != null && currentMapNode .influenced ==true) + { + List ints = SettlementManager.Instance.PreviewColorMapUnity(currentCardEntity.cardOriginalData, currentMapNode); + for (int i = 0; i < ints.Count; i++) + { + switch (i) + { + case 1: + redNodeCountLatest = redNodeCount + ints[i]; + redText.text = (redNodeCount+ ints[i]).ToString(); + redTextPre .gameObject .SetActive(true); + if(ints[i]>0) + { + redTextPre.text = "(" +"+" +ints[i].ToString() + ")"; + } + else + { + redTextPre.text = "(" + ints[i].ToString() + ")"; + } + redTextPre.transform.localPosition = new Vector3(redText.transform.localPosition.x, redText.transform.localPosition.y-50f, 0); + break; + case 2: + whiteNodeCountLatest = whiteNodeCount + ints[i]; + whiteText.text = (whiteNodeCount + ints[i]).ToString(); + whiteTextPre .gameObject .SetActive(true); + if (ints[i] > 0) + { + whiteTextPre.text = "(" + "+" + ints[i].ToString() + ")"; + } + else + { + whiteTextPre.text = "(" + ints[i].ToString() + ")"; + } + whiteTextPre.transform.localPosition = new Vector3(whiteText.transform.localPosition.x, whiteText.transform.localPosition.y - 50f, 0); + break; + case 3: + blueNodeCountLatest = blueNodeCount + ints[i]; + blueText.text = (blueNodeCount+ ints[i]).ToString(); + blueTextPre .gameObject .SetActive(true); + if (ints[i] > 0) + { + blueTextPre.text = "(" +"+"+ ints[i].ToString() + ")"; + } + else + { + blueTextPre.text = "(" + ints[i].ToString() + ")"; + } + blueTextPre.text = "(" + ints[i].ToString() + ")"; + blueTextPre.transform.localPosition = new Vector3(blueText.transform.localPosition.x, blackText.transform.localPosition.y - 50f, 0); + break; + case 4: + greenNodeCountLatest = greenNodeCount + ints[i]; + greenText.text = (greenNodeCount + ints[i]).ToString(); + greenTextPre .gameObject .SetActive(true); + if (ints[i] > 0) + { + greenTextPre.text = "(" + "+"+ ints[i].ToString() + ")"; + } + else + { + greenTextPre.text = "(" + ints[i].ToString() + ")"; + } + + greenTextPre.transform.localPosition = new Vector3(greenText.transform.localPosition.x, greenText.transform.localPosition.y - 50f, 0); + break; + case 5: + // blackNodeCountLatest = blackNodeCount - ints[i]; + blackText.text = (blackNodeCount + ints[i]).ToString(); + blackTextPre .gameObject .SetActive(true); + if (ints[i] > 0) + { + blackTextPre.text = "(" +"+"+ ints[i].ToString() + ")"; + } + else + { + blackTextPre.text = "(" + ints[i].ToString() + ")"; + } + blackTextPre.transform.localPosition = new Vector3(blackText.transform.localPosition.x, blackText.transform.localPosition.y - 50f, 0); + break; + } + } + + sumPlayerText.text = (redNodeCount + blueNodeCount + greenNodeCount + ints[1] + ints[3] + ints[4]).ToString(); + sumPlayerTextPre .gameObject .SetActive(true); + sumPlayerTextPre.transform.localPosition = new Vector3(sumPlayerText.transform.localPosition.x + 150f, sumPlayerText.transform.localPosition.y , 0); + if (ints[1] + ints[3] + ints[4]>0) + { + sumPlayerTextPre.text = "("+"+"+(ints[1] + ints[3] + ints[4]).ToString() + ")"; + } + else + { + sumPlayerTextPre.text = "(" + (ints[1] + ints[3] + ints[4]).ToString() + ")"; + } + sumMiddleText.text = (whiteNodeCount + ints[2]).ToString(); + sumMiddleTextPre .gameObject .SetActive(true); + sumMiddleTextPre.transform.localPosition = new Vector3(sumMiddleText.transform.localPosition.x + 150f, sumMiddleText.transform.localPosition.y, 0); + if (ints[2] > 0) + { + sumMiddleTextPre.text = "(" + "+" + ints[2].ToString() + ")"; + } + else + { + sumMiddleTextPre.text = "(" + ints[2].ToString() + ")"; + } + sumRightText.text = (blackNodeCount + ints[5]).ToString(); + sumRightTextPre .gameObject .SetActive(true); + sumRightTextPre.transform.localPosition = new Vector3(sumRightText.transform.localPosition.x + 150f, sumRightText.transform.localPosition.y, 0); + if (ints[5] > 0) + { + sumRightTextPre.text= "(" + "+" + ints[5].ToString() + ")"; + } + else + { + sumRightTextPre.text = "(" + ints[5].ToString() + ")"; + } + } + else + { + redTextPre.gameObject.SetActive(false); + whiteTextPre.gameObject.SetActive(false); + blueTextPre.gameObject.SetActive(false); + greenTextPre.gameObject.SetActive(false); + blackTextPre.gameObject.SetActive(false); + sumPlayerTextPre.gameObject .SetActive(false); + sumMiddleTextPre.gameObject.SetActive(false); + sumRightTextPre.gameObject.SetActive(false); + } //文字位置 float length = barBox.sizeDelta.x; redText.transform.localPosition = new Vector3((length * (Red.fillAmount-1))*0.5f, 0, 0); greenText.transform.localPosition = new Vector3(length * 0.5f * (Green.fillAmount + Red.fillAmount - 1), 0, 0); blueText.transform.localPosition = new Vector3(length * 0.5f * (Bule.fillAmount + Green.fillAmount - 1), 0, 0); - blackText .transform .localPosition = new Vector3 (length * 0.5f * (Black.fillAmount + Bule.fillAmount - 1), 0, 0); - whiteText.transform.localPosition= new Vector3 (length * 0.5f * Black.fillAmount , 0, 0); - + whiteText .transform .localPosition = new Vector3 (length * 0.5f * (White.fillAmount + Bule.fillAmount - 1), 0, 0); + blackText.transform.localPosition= new Vector3 (length * 0.5f * White.fillAmount , 0, 0); + sumPlayerText .transform .localPosition = new Vector3 (length * (Bule.fillAmount - 1) * 0.5f,150,0); - sumMiddleText.transform.localPosition = new Vector3(whiteText.transform .localPosition .x , 150, 0); - sumEnemyText.transform.localPosition = new Vector3(blackText.transform.localPosition.x, 150, 0); + sumMiddleText.transform.localPosition = new Vector3(whiteText.transform.localPosition.x, 150, 0); + sumRightText.transform.localPosition = new Vector3(blackText.transform.localPosition.x, 150, 0); //太阳 string advColor = MapUnityManager.Instance.getAdvNode(); if(lastSunColor != advColor ) @@ -285,7 +427,10 @@ public class GameManager : Singleton break; } } - } + + + + } //统计场地颜色 public bool SyncColourCountUI() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs index 933ed945..e50ed8c8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs @@ -75,6 +75,60 @@ public class SettlementManager : Singleton } } + //预计地块计数 + public List PreviewColorMapUnity(CardOriginalData cardOriginalData, MapUnity targetNode) + { + List mapColorCount = new List() { 0,0,0,0,0,0};//1red,2white,3blue,4green,5black + + ZeroToFiveCircularCounter counter = new ZeroToFiveCircularCounter(); + int offset = 3; + Vector3 face = targetNode.transform.position - GameManager.Instance.playerOn.transform.position; + if (!targetNode.Equals(GameManager.Instance.playerOn)) + { + float euler = Vector3.SignedAngle(-GameManager.Instance.playerOn.transform.forward, face, GameManager.Instance.playerOn.transform.up) + 180; + offset = getEulerOffset(offset, euler); + } + if (!cardOriginalData.nodesColor[0].Equals(Name.none)) + { + // targetNode.switchColor(Name.stringColorToint(cardOriginalData.nodesColor[0])); + if (targetNode.whoColour != Name.stringColorToint(cardOriginalData.nodesColor[0])) + { + mapColorCount[Name.stringColorToint(cardOriginalData.nodesColor[0])] += 1; + mapColorCount[targetNode.whoColour] -= 1; + } + } + // Debug.Log("offset是" + offset); + for (int i = 0; i < cardOriginalData.nodesMark.Length; i++) + { + MapUnity endNode = targetNode; + try + { + string[] marks = cardOriginalData.nodesMark[i].Split("_"); + for (int j = 0; j < marks.Length; j++) + { + MapUnity oldNode = endNode; + endNode = oldNode.unitPool[counter.Add(offset, int.Parse(marks[j]))]; + } + if (endNode != null) + { + // endNode.switchColor(Name.stringColorToint(cardOriginalData.nodesColor[i + 1])); + if(endNode.whoColour != Name.stringColorToint(cardOriginalData.nodesColor[i + 1])) + { + mapColorCount[Name.stringColorToint(cardOriginalData.nodesColor[i + 1])] += 1; + mapColorCount[endNode.whoColour] -= 1; + } + + } + } + catch (Exception e) + { + + } + + } + + return mapColorCount; + } private int getEulerOffset(int offset, float euler) {