summaryrefslogtreecommitdiff
path: root/AlienSurvival/Assets/Test
diff options
context:
space:
mode:
Diffstat (limited to 'AlienSurvival/Assets/Test')
-rw-r--r--AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity272
-rw-r--r--AlienSurvival/Assets/Test/Scripts/TestFakeHeight.cs29
-rw-r--r--AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs10
3 files changed, 278 insertions, 33 deletions
diff --git a/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity b/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity
index e2b7482..5f7efd9 100644
--- a/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity
+++ b/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity
@@ -185,6 +185,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 278299573}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &21703930
BoxCollider2D:
@@ -510,6 +511,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1506896592}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &76560323
BoxCollider2D:
@@ -655,6 +657,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 640031758}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &80465631
SpriteRenderer:
@@ -823,6 +826,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 223962595}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &110910047
BoxCollider2D:
@@ -984,6 +988,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 800096343}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &122970567
BoxCollider2D:
@@ -1227,6 +1232,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 61158755}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &135903468
BoxCollider2D:
@@ -1416,6 +1422,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1945177636}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &145368953
BoxCollider2D:
@@ -1577,6 +1584,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 25990584}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &184434240
BoxCollider2D:
@@ -1722,6 +1730,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 771334776}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &185848757
SpriteRenderer:
@@ -2199,7 +2208,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -981
+ m_SortingOrder: -913
m_Sprite: {fileID: -6997709495448532824, guid: fb08b0f068cbce749917cffaef128c3f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -2219,7 +2228,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 231104471}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 5.43, y: 10.32, z: 0}
+ m_LocalPosition: {x: 4.43, y: 9.63, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 858498575}
@@ -2239,6 +2248,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 858498575}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0.5
--- !u!1 &248224694
GameObject:
@@ -2521,6 +2531,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 298694134}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!1 &272870307
GameObject:
@@ -2932,6 +2943,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 189969961}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &302118665
BoxCollider2D:
@@ -3175,6 +3187,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 761491700}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &307330108
BoxCollider2D:
@@ -3411,6 +3424,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1359833006}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &324941502
BoxCollider2D:
@@ -3572,6 +3586,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 94471841}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &343195988
BoxCollider2D:
@@ -3869,6 +3884,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1891333707}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &389948435
BoxCollider2D:
@@ -4307,6 +4323,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1077636387}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!114 &414827381
MonoBehaviour:
@@ -4383,6 +4400,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 370904206}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &441792236
BoxCollider2D:
@@ -4626,6 +4644,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1024741976}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &476843536
BoxCollider2D:
@@ -4935,6 +4954,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1610098375}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &500022327
SpriteRenderer:
@@ -5049,6 +5069,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1040158455}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &534247384
BoxCollider2D:
@@ -5182,6 +5203,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 449721433}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &537202037
BoxCollider2D:
@@ -5406,6 +5428,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 496145695}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!1 &554226455
GameObject:
@@ -5535,6 +5558,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 588009569}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &579864785
SpriteRenderer:
@@ -5813,6 +5837,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1074757283}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &614277021
BoxCollider2D:
@@ -6110,6 +6135,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1434399339}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &651541160
BoxCollider2D:
@@ -6353,6 +6379,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1124799057}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &668633360
BoxCollider2D:
@@ -6690,6 +6717,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 736818747}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &729199533
SpriteRenderer:
@@ -6886,6 +6914,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1372540297}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &739593293
BoxCollider2D:
@@ -7129,6 +7158,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 2114883497}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &759472852
BoxCollider2D:
@@ -7325,6 +7355,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 248224695}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!1 &761491699
GameObject:
@@ -7552,6 +7583,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1350486361}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &789200998
BoxCollider2D:
@@ -8130,6 +8162,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1857296051}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &826132326
BoxCollider2D:
@@ -8238,9 +8271,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 844062964}
+ - component: {fileID: 844062966}
- component: {fileID: 844062963}
- component: {fileID: 844062962}
- - component: {fileID: 844062966}
m_Layer: 0
m_Name: robot4_s
m_TagString: Untagged
@@ -8306,7 +8339,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -900
+ m_SortingOrder: -1071
m_Sprite: {fileID: -3685877254663532703, guid: a75b74e89c53fb043902fbe6216cd330, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -8326,7 +8359,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 844062961}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 2.9, y: 9.8, z: 0}
+ m_LocalPosition: {x: 2.1, y: 12.92, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 900101674}
@@ -8346,7 +8379,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 900101674}
- m_Height: 0.8
+ m_Coord: {x: 0, y: 0, z: 0}
+ m_Height: 2.21
--- !u!1 &844200861
GameObject:
m_ObjectHideFlags: 0
@@ -8381,6 +8415,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1705140735}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &844200863
BoxCollider2D:
@@ -8774,6 +8809,139 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &895402452
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 895402455}
+ - component: {fileID: 895402456}
+ - component: {fileID: 895402454}
+ - component: {fileID: 895402453}
+ - component: {fileID: 895402457}
+ m_Layer: 0
+ m_Name: robot4_s (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!95 &895402453
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 895402452}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: c288768725772e54da99ef56233329bb, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!212 &895402454
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 895402452}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 0
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: -1071
+ m_Sprite: {fileID: -3685877254663532703, guid: a75b74e89c53fb043902fbe6216cd330, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 0.5, y: 0.5}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!4 &895402455
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 895402452}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.0019090377, y: 6.621127, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 27
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &895402456
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 895402452}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_LocalPosition: {x: 0.0019090377, y: 4.7122717, z: 1.9088556}
+ m_LocalRotation: 0
+ m_LocalScale: {x: 0, y: 0}
+--- !u!114 &895402457
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 895402452}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f1ce201566412034c99687a8c5b94075, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Color: {r: 0, g: 0, b: 0, a: 0.105882354}
+ m_Scale: {x: 1, y: 0.5}
--- !u!1 &900101673
GameObject:
m_ObjectHideFlags: 0
@@ -8800,7 +8968,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 900101673}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: -0.8000002, z: 0}
+ m_LocalPosition: {x: 0, y: -2.21, z: 0}
m_LocalScale: {x: 1, y: 0.36872143, z: 1}
m_Children: []
m_Father: {fileID: 844062964}
@@ -9181,6 +9349,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 126253428}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &969299182
BoxCollider2D:
@@ -9446,6 +9615,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 283677161}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &985163035
BoxCollider2D:
@@ -9591,6 +9761,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 303194465}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &1014048670
SpriteRenderer:
@@ -9756,6 +9927,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1220265300}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &1028795856
SpriteRenderer:
@@ -10131,6 +10303,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 804012454}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1082710340
BoxCollider2D:
@@ -10622,6 +10795,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 665839133}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &1179934519
SpriteRenderer:
@@ -10736,6 +10910,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 393322331}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1187369532
BoxCollider2D:
@@ -10979,6 +11154,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 554226456}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1221673134
BoxCollider2D:
@@ -11201,6 +11377,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 492861022}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1262247791
BoxCollider2D:
@@ -11331,6 +11508,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 795087558}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &1262303135
SpriteRenderer:
@@ -11870,6 +12048,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 755759089}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1381586389
BoxCollider2D:
@@ -12148,6 +12327,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1875111738}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!1 &1424091755
GameObject:
@@ -12211,6 +12391,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 254252115}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1424091759
BoxCollider2D:
@@ -12388,7 +12569,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -1017
+ m_SortingOrder: -1035
m_Sprite: {fileID: -6288526288528838362, guid: 180253d8c3a9d7d49ab41c54181dae83, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -12408,7 +12589,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1427931716}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 8.41, y: 11.66, z: 0}
+ m_LocalPosition: {x: 7.23, y: 11.84, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 230886355}
@@ -12428,6 +12609,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 230886355}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 1.49
--- !u!114 &1427931721
MonoBehaviour:
@@ -12602,6 +12784,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 933707760}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1444030000
BoxCollider2D:
@@ -12763,6 +12946,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 363641695}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1448641835
BoxCollider2D:
@@ -12896,6 +13080,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 272870308}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1451924845
BoxCollider2D:
@@ -13085,6 +13270,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1133610727}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1468482491
BoxCollider2D:
@@ -13394,6 +13580,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 699760445}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &1508965810
SpriteRenderer:
@@ -13620,6 +13807,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 413772985}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!1 &1525058237
GameObject:
@@ -14050,6 +14238,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1744602883}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1581945045
BoxCollider2D:
@@ -14306,6 +14495,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1280541848}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!1 &1610098374
GameObject:
@@ -14486,6 +14676,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1661597061}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!1 &1655800953
GameObject:
@@ -14564,7 +14755,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -802
+ m_SortingOrder: -1083
m_Sprite: {fileID: 5068832224188716903, guid: f81265fcc613abd44bffbfcb7215359b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -14584,7 +14775,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1655800953}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.37737918, y: 9.020008, z: 0}
+ m_LocalPosition: {x: -1.3773792, y: 11.8300085, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1545137360}
@@ -14604,6 +14795,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1545137360}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 1
--- !u!1 &1661597060
GameObject:
@@ -14718,6 +14910,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 636330454}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &1674033084
SpriteRenderer:
@@ -14847,6 +15040,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1951955983}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1694780490
BoxCollider2D:
@@ -15074,6 +15268,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1949200981}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &1702781892
SpriteRenderer:
@@ -15390,6 +15585,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1346058209}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1771037015
BoxCollider2D:
@@ -15563,6 +15759,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1809109968}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &1808103858
SpriteRenderer:
@@ -15743,6 +15940,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1525058238}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &1826905635
SpriteRenderer:
@@ -15857,6 +16055,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 2133381789}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1828131699
BoxCollider2D:
@@ -16300,6 +16499,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 864280003}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!1 &1891333706
GameObject:
@@ -16429,6 +16629,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1698128101}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &1896371516
SpriteRenderer:
@@ -16543,6 +16744,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 2083778505}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1900112764
BoxCollider2D:
@@ -16786,6 +16988,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 2017869643}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1917618513
BoxCollider2D:
@@ -16947,6 +17150,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 723816278}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &1935713722
BoxCollider2D:
@@ -17338,6 +17542,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1907535904}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!212 &1993403373
SpriteRenderer:
@@ -17452,6 +17657,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 954600505}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &2003592892
BoxCollider2D:
@@ -17613,6 +17819,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 209548591}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &2016191311
BoxCollider2D:
@@ -17856,6 +18063,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 610667406}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &2078978986
BoxCollider2D:
@@ -18176,7 +18384,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: -580
+ m_SortingOrder: -861
m_Sprite: {fileID: 21300000, guid: 52dab49f83ccd8f4895a647210165e85, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -18196,7 +18404,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2103777676}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -3.6, y: 6.8, z: 0}
+ m_LocalPosition: {x: -4.6, y: 9.610001, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 865193497}
@@ -18216,6 +18424,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 865193497}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 1
--- !u!1 &2114883496
GameObject:
@@ -18299,6 +18508,36 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &2117414729
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2117414730}
+ m_Layer: 0
+ m_Name: GameObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2117414730
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2117414729}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 1.93, y: 8.76, z: -0.42769396}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 28
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2126951608
GameObject:
m_ObjectHideFlags: 0
@@ -18361,6 +18600,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Shadow: {fileID: 1387531137}
+ m_Coord: {x: 0, y: 0, z: 0}
m_Height: 0
--- !u!61 &2126951612
BoxCollider2D:
@@ -18677,11 +18917,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8582758513482715753, guid: 32f108a63fddba54fbcf9b728f232946, type: 3}
propertyPath: m_LocalPosition.x
- value: 8.360001
+ value: 8.14
objectReference: {fileID: 0}
- target: {fileID: 8582758513482715753, guid: 32f108a63fddba54fbcf9b728f232946, type: 3}
propertyPath: m_LocalPosition.y
- value: 6.5700016
+ value: 8.41
objectReference: {fileID: 0}
- target: {fileID: 8582758513482715753, guid: 32f108a63fddba54fbcf9b728f232946, type: 3}
propertyPath: m_LocalPosition.z
@@ -18717,7 +18957,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8582758513482715754, guid: 32f108a63fddba54fbcf9b728f232946, type: 3}
propertyPath: m_SortingOrder
- value: -607
+ value: -790
objectReference: {fileID: 0}
- target: {fileID: 8582758513482715755, guid: 32f108a63fddba54fbcf9b728f232946, type: 3}
propertyPath: m_Name
diff --git a/AlienSurvival/Assets/Test/Scripts/TestFakeHeight.cs b/AlienSurvival/Assets/Test/Scripts/TestFakeHeight.cs
index e427e20..4cc13d1 100644
--- a/AlienSurvival/Assets/Test/Scripts/TestFakeHeight.cs
+++ b/AlienSurvival/Assets/Test/Scripts/TestFakeHeight.cs
@@ -5,12 +5,23 @@ using UnityEngine;
using UnityEditor;
#endif
-[ExecuteInEditMode]
+//[ExecuteInEditMode]
public class TestFakeHeight : MonoBehaviour
{
[SerializeField] private Transform m_Shadow;
+ [SerializeField] private Vector3 m_Coord;
- public float height { get { return m_Height; } set { m_Height = value; } }
+
+ public float height {
+ get
+ {
+ return m_Height;
+ }
+ set
+ {
+ m_Height = value;
+ }
+ }
[SerializeField] private float m_Height; // current fake height
public float x
@@ -49,6 +60,12 @@ public class TestFakeHeight : MonoBehaviour
Vector3 pos = new Vector3(x, y, height);
return pos;
}
+ set
+ {
+ height = value.z; // height先设置
+ x = value.x;
+ y = value.y;
+ }
}
public Vector2 positionOnGround
@@ -65,8 +82,6 @@ public class TestFakeHeight : MonoBehaviour
}
}
- private float m_PreHeight;
-
private SpriteRenderer m_SpriteRenderer;
private void OnEnable()
@@ -76,15 +91,13 @@ public class TestFakeHeight : MonoBehaviour
private void Start()
{
- m_PreHeight = 0;
Project();
}
void Project()
{
Vector3 pos = transform.position;
-
- pos.y = pos.y - m_PreHeight + m_Height;
+ pos.y = y + height;
transform.position = pos;
if (m_Shadow != null)
@@ -92,8 +105,6 @@ public class TestFakeHeight : MonoBehaviour
m_Shadow.position = new Vector3(transform.position.x, transform.position.y - m_Height, transform.position.z);
}
- m_PreHeight = m_Height;
-
// 根据y设置sortOrder
m_SpriteRenderer.sortingOrder = (int)(-y * 100);
}
diff --git a/AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs b/AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs
index 109e47b..cd12c1e 100644
--- a/AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs
+++ b/AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs
@@ -15,7 +15,6 @@ public class TestPeaceMakerGrenade : MonoBehaviour
private Vector3 m_Velocity; // x, y, fakeHeight
-
/// <summary>
/// 设置初始参数，都在fake空间下
/// </summary>
@@ -25,10 +24,7 @@ public class TestPeaceMakerGrenade : MonoBehaviour
public void Set(Vector3 initPosition, Vector3 initDirection, float initSpeed)
{
m_Coords = GetComponent<TestFakeHeight>();
-
- m_Coords.x = initPosition.x;
- m_Coords.y = initPosition.y;
- m_Coords.height = initPosition.z;
+ m_Coords.position = initPosition;
m_Velocity = initDirection * initSpeed;
}
@@ -61,9 +57,7 @@ public class TestPeaceMakerGrenade : MonoBehaviour
GameObject exp = Instantiate<GameObject>(m_ExplosionEffect);
TestFakeHeight coord = exp.GetComponent<TestFakeHeight>();
- coord.x = m_Coords.x;
- coord.y = m_Coords.y;
- coord.height = m_Coords.height;
+ coord.position = m_Coords.position;
exp.SetActive(true);
}
generated by cgit v1.1-26-g67d0 at 2025-05-29 04:27:34 +0000