BUG修改

Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace01.unity

@@ -158,7 +158,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: -77, y: -20}
+  m_AnchoredPosition: {x: -8, y: -30}
   m_SizeDelta: {x: 80, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &944969
@@ -215,7 +215,7 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 1
-  m_HorizontalAlignment: 1
+  m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
@@ -1080,13 +1080,13 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 28
-  m_fontSizeBase: 28
+  m_fontSize: 60
+  m_fontSizeBase: 60
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -1895,7 +1895,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: 140, y: -8.3}
+  m_AnchoredPosition: {x: 142.5, y: -8.3}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &469560292
@@ -2142,7 +2142,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u8FD4\u56DE\u4E0A\u4E00\u5173"
+  m_Text: "\u8FD4\u56DE\u4E0A\u4E00\u9875"
 --- !u!222 &478941981
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2843,6 +2843,7 @@ MonoBehaviour:
   - {fileID: 1344082928}
   - {fileID: 64299057}
   - {fileID: 1448217305}
+  - {fileID: 959593320}
   Clips:
   - {fileID: 0}
   - {fileID: 0}
@@ -4163,6 +4164,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 948674113}
   m_CullTransparentMesh: 1
+--- !u!1 &959593319
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 959593322}
+  - component: {fileID: 959593321}
+  - component: {fileID: 959593320}
+  m_Layer: 5
+  m_Name: Image (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &959593320
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 959593319}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: 4b170255e321c974d97ac237a55d1e17, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &959593321
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 959593319}
+  m_CullTransparentMesh: 1
+--- !u!224 &959593322
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 959593319}
+  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: 1219179819}
+  m_RootOrder: 3
+  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: 62.8, y: 16}
+  m_SizeDelta: {x: 40, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &991610503
 GameObject:
   m_ObjectHideFlags: 0
@@ -5053,7 +5130,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 23, y: 23}
+  m_AnchoredPosition: {x: 23, y: 78}
   m_SizeDelta: {x: 287, y: 59}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &1190588249
@@ -5241,6 +5318,7 @@ RectTransform:
   - {fileID: 1344082926}
   - {fileID: 64299055}
   - {fileID: 1448217303}
+  - {fileID: 959593322}
   m_Father: {fileID: 613881825}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5469,29 +5547,19 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1220786323}
   m_CullTransparentMesh: 1
---- !u!114 &1220786328
-MonoBehaviour:
+--- !u!65 &1220786328
+BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1220786323}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  targetRTF: {fileID: 0}
-  targetGraphic: {fileID: 0}
-  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
-  targetButton: {fileID: 0}
-  cellObj: {fileID: 0}
-  OnStartEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  OnEndEvent:
-    m_PersistentCalls:
-      m_Calls: []
+  serializedVersion: 2
+  m_Size: {x: 120, y: 30, z: 1}
+  m_Center: {x: 60, y: -15, z: 0}
 --- !u!1 &1233954229
 GameObject:
   m_ObjectHideFlags: 0
@@ -5681,7 +5749,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: 29.3, y: -90}
+  m_AnchoredPosition: {x: 29.3, y: -132.91}
   m_SizeDelta: {x: 430.69, y: 49.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1261969196
@@ -6640,29 +6708,19 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1452188145}
   m_CullTransparentMesh: 1
---- !u!114 &1452188150
-MonoBehaviour:
+--- !u!65 &1452188150
+BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1452188145}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  targetRTF: {fileID: 0}
-  targetGraphic: {fileID: 0}
-  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
-  targetButton: {fileID: 0}
-  cellObj: {fileID: 0}
-  OnStartEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  OnEndEvent:
-    m_PersistentCalls:
-      m_Calls: []
+  serializedVersion: 2
+  m_Size: {x: 120, y: 30, z: 1}
+  m_Center: {x: 60, y: -15, z: 0}
 --- !u!1 &1455452736
 GameObject:
   m_ObjectHideFlags: 0
@@ -6699,7 +6757,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: -77, y: -60}
+  m_AnchoredPosition: {x: -4.0000134, y: -68.6}
   m_SizeDelta: {x: 80, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1455452738
@@ -7742,29 +7800,19 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1688059641}
   m_CullTransparentMesh: 1
---- !u!114 &1688059646
-MonoBehaviour:
+--- !u!65 &1688059646
+BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1688059641}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  targetRTF: {fileID: 0}
-  targetGraphic: {fileID: 0}
-  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
-  targetButton: {fileID: 0}
-  cellObj: {fileID: 0}
-  OnStartEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  OnEndEvent:
-    m_PersistentCalls:
-      m_Calls: []
+  serializedVersion: 2
+  m_Size: {x: 120, y: 30, z: 1}
+  m_Center: {x: 60, y: -15, z: 0}
 --- !u!1 &1719776955
 GameObject:
   m_ObjectHideFlags: 0
@@ -14126,7 +14174,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: 66, y: -20}
+  m_AnchoredPosition: {x: -3.4, y: -87.65}
   m_SizeDelta: {x: 80, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2091816791

Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace02.unity

@@ -158,7 +158,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: -77, y: -20}
+  m_AnchoredPosition: {x: -8, y: -30}
   m_SizeDelta: {x: 80, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &944969
@@ -215,7 +215,7 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 1
-  m_HorizontalAlignment: 1
+  m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
@@ -1080,13 +1080,13 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 28
-  m_fontSizeBase: 28
+  m_fontSize: 60
+  m_fontSizeBase: 60
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -1895,7 +1895,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: 140, y: -8.3}
+  m_AnchoredPosition: {x: 142.5, y: -8.3}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &469560292
@@ -2142,7 +2142,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u8FD4\u56DE\u4E0A\u4E00\u5173"
+  m_Text: "\u8FD4\u56DE\u4E0A\u4E00\u9875"
 --- !u!222 &478941981
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2843,6 +2843,7 @@ MonoBehaviour:
   - {fileID: 1344082928}
   - {fileID: 64299057}
   - {fileID: 1448217305}
+  - {fileID: 959593320}
   Clips:
   - {fileID: 0}
   - {fileID: 0}
@@ -4163,6 +4164,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 948674113}
   m_CullTransparentMesh: 1
+--- !u!1 &959593319
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 959593322}
+  - component: {fileID: 959593321}
+  - component: {fileID: 959593320}
+  m_Layer: 5
+  m_Name: Image (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &959593320
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 959593319}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: 4b170255e321c974d97ac237a55d1e17, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &959593321
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 959593319}
+  m_CullTransparentMesh: 1
+--- !u!224 &959593322
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 959593319}
+  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: 1219179819}
+  m_RootOrder: 3
+  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: 62.8, y: 16}
+  m_SizeDelta: {x: 40, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &991610503
 GameObject:
   m_ObjectHideFlags: 0
@@ -5053,7 +5130,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 23, y: 23}
+  m_AnchoredPosition: {x: 23, y: 78}
   m_SizeDelta: {x: 287, y: 59}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &1190588249
@@ -5241,6 +5318,7 @@ RectTransform:
   - {fileID: 1344082926}
   - {fileID: 64299055}
   - {fileID: 1448217303}
+  - {fileID: 959593322}
   m_Father: {fileID: 613881825}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5469,29 +5547,19 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1220786323}
   m_CullTransparentMesh: 1
---- !u!114 &1220786328
-MonoBehaviour:
+--- !u!65 &1220786328
+BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1220786323}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  targetRTF: {fileID: 0}
-  targetGraphic: {fileID: 0}
-  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
-  targetButton: {fileID: 0}
-  cellObj: {fileID: 0}
-  OnStartEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  OnEndEvent:
-    m_PersistentCalls:
-      m_Calls: []
+  serializedVersion: 2
+  m_Size: {x: 120, y: 30, z: 1}
+  m_Center: {x: 60, y: -15, z: 0}
 --- !u!1 &1233954229
 GameObject:
   m_ObjectHideFlags: 0
@@ -5681,7 +5749,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: 29.3, y: -90}
+  m_AnchoredPosition: {x: 29.3, y: -132.91}
   m_SizeDelta: {x: 430.69, y: 49.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1261969196
@@ -6640,29 +6708,19 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1452188145}
   m_CullTransparentMesh: 1
---- !u!114 &1452188150
-MonoBehaviour:
+--- !u!65 &1452188150
+BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1452188145}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  targetRTF: {fileID: 0}
-  targetGraphic: {fileID: 0}
-  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
-  targetButton: {fileID: 0}
-  cellObj: {fileID: 0}
-  OnStartEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  OnEndEvent:
-    m_PersistentCalls:
-      m_Calls: []
+  serializedVersion: 2
+  m_Size: {x: 120, y: 30, z: 1}
+  m_Center: {x: 60, y: -15, z: 0}
 --- !u!1 &1455452736
 GameObject:
   m_ObjectHideFlags: 0
@@ -6699,7 +6757,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: -77, y: -60}
+  m_AnchoredPosition: {x: -4.0000134, y: -68.6}
   m_SizeDelta: {x: 80, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1455452738
@@ -7742,29 +7800,19 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1688059641}
   m_CullTransparentMesh: 1
---- !u!114 &1688059646
-MonoBehaviour:
+--- !u!65 &1688059646
+BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1688059641}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  targetRTF: {fileID: 0}
-  targetGraphic: {fileID: 0}
-  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
-  targetButton: {fileID: 0}
-  cellObj: {fileID: 0}
-  OnStartEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  OnEndEvent:
-    m_PersistentCalls:
-      m_Calls: []
+  serializedVersion: 2
+  m_Size: {x: 120, y: 30, z: 1}
+  m_Center: {x: 60, y: -15, z: 0}
 --- !u!1 &1719776955
 GameObject:
   m_ObjectHideFlags: 0
@@ -14126,7 +14174,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: 66, y: -20}
+  m_AnchoredPosition: {x: -3.4, y: -87.65}
   m_SizeDelta: {x: 80, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2091816791

Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace02.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a8f19bc110806934f963b49a6dcb0c70
+guid: 8b4b4cd86ef030d41a518cef70709fc1
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace03.unity

@@ -158,7 +158,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: -77, y: -20}
+  m_AnchoredPosition: {x: -8, y: -30}
   m_SizeDelta: {x: 80, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &944969
@@ -215,7 +215,7 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 1
-  m_HorizontalAlignment: 1
+  m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
@@ -1080,13 +1080,13 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 28
-  m_fontSizeBase: 28
+  m_fontSize: 60
+  m_fontSizeBase: 60
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -1895,7 +1895,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: 140, y: -8.3}
+  m_AnchoredPosition: {x: 142.5, y: -8.3}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &469560292
@@ -2142,7 +2142,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u8FD4\u56DE\u4E0A\u4E00\u5173"
+  m_Text: "\u8FD4\u56DE\u4E0A\u4E00\u9875"
 --- !u!222 &478941981
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2843,6 +2843,7 @@ MonoBehaviour:
   - {fileID: 1344082928}
   - {fileID: 64299057}
   - {fileID: 1448217305}
+  - {fileID: 959593320}
   Clips:
   - {fileID: 0}
   - {fileID: 0}
@@ -4163,6 +4164,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 948674113}
   m_CullTransparentMesh: 1
+--- !u!1 &959593319
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 959593322}
+  - component: {fileID: 959593321}
+  - component: {fileID: 959593320}
+  m_Layer: 5
+  m_Name: Image (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &959593320
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 959593319}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: 4b170255e321c974d97ac237a55d1e17, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &959593321
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 959593319}
+  m_CullTransparentMesh: 1
+--- !u!224 &959593322
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 959593319}
+  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: 1219179819}
+  m_RootOrder: 3
+  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: 62.8, y: 16}
+  m_SizeDelta: {x: 40, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &991610503
 GameObject:
   m_ObjectHideFlags: 0
@@ -5053,7 +5130,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 23, y: 23}
+  m_AnchoredPosition: {x: 25, y: 78}
   m_SizeDelta: {x: 287, y: 59}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &1190588249
@@ -5241,6 +5318,7 @@ RectTransform:
   - {fileID: 1344082926}
   - {fileID: 64299055}
   - {fileID: 1448217303}
+  - {fileID: 959593322}
   m_Father: {fileID: 613881825}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5469,29 +5547,19 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1220786323}
   m_CullTransparentMesh: 1
---- !u!114 &1220786328
-MonoBehaviour:
+--- !u!65 &1220786328
+BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1220786323}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  targetRTF: {fileID: 0}
-  targetGraphic: {fileID: 0}
-  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
-  targetButton: {fileID: 0}
-  cellObj: {fileID: 0}
-  OnStartEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  OnEndEvent:
-    m_PersistentCalls:
-      m_Calls: []
+  serializedVersion: 2
+  m_Size: {x: 120, y: 30, z: 1}
+  m_Center: {x: 60, y: -15, z: 0}
 --- !u!1 &1233954229
 GameObject:
   m_ObjectHideFlags: 0
@@ -5681,7 +5749,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: 29.3, y: -90}
+  m_AnchoredPosition: {x: 29.3, y: -132.91}
   m_SizeDelta: {x: 430.69, y: 49.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1261969196
@@ -6640,29 +6708,19 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1452188145}
   m_CullTransparentMesh: 1
---- !u!114 &1452188150
-MonoBehaviour:
+--- !u!65 &1452188150
+BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1452188145}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  targetRTF: {fileID: 0}
-  targetGraphic: {fileID: 0}
-  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
-  targetButton: {fileID: 0}
-  cellObj: {fileID: 0}
-  OnStartEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  OnEndEvent:
-    m_PersistentCalls:
-      m_Calls: []
+  serializedVersion: 2
+  m_Size: {x: 120, y: 30, z: 1}
+  m_Center: {x: 60, y: -15, z: 0}
 --- !u!1 &1455452736
 GameObject:
   m_ObjectHideFlags: 0
@@ -6699,7 +6757,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: -77, y: -60}
+  m_AnchoredPosition: {x: -4.0000134, y: -68.6}
   m_SizeDelta: {x: 80, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1455452738
@@ -7742,29 +7800,19 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1688059641}
   m_CullTransparentMesh: 1
---- !u!114 &1688059646
-MonoBehaviour:
+--- !u!65 &1688059646
+BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1688059641}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9041465d981afb74e8861a84f98f2dbd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  targetRTF: {fileID: 0}
-  targetGraphic: {fileID: 0}
-  selectedColor: {r: 1, g: 1, b: 1, a: 0.6}
-  targetButton: {fileID: 0}
-  cellObj: {fileID: 0}
-  OnStartEvent:
-    m_PersistentCalls:
-      m_Calls: []
-  OnEndEvent:
-    m_PersistentCalls:
-      m_Calls: []
+  serializedVersion: 2
+  m_Size: {x: 120, y: 30, z: 1}
+  m_Center: {x: 60, y: -15, z: 0}
 --- !u!1 &1719776955
 GameObject:
   m_ObjectHideFlags: 0
@@ -14126,7 +14174,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: 66, y: -20}
+  m_AnchoredPosition: {x: -3.4, y: -87.65}
   m_SizeDelta: {x: 80, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2091816791

Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace03.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e89fd004630b8c4429343aed55df58ab
+guid: c11ebb4255a33d0468433bf8ef2fc8dc
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Game_Hyperspace/Script/Font.cs

@@ -7,126 +7,132 @@ using UnityEngine.UI;
 
 namespace HyperspaceGame
 {
-public class Font : MonoBehaviour
-{
-    public List<Sprite> sprites = new();
-    public List<Image> coms = new();
-    public List<Image> overScore = new();
-    public List<Image> Clips = new();
-
-    private int _num;
-    private int bullet;
-    public int Text
+    public class Font : MonoBehaviour
     {
-        set
-        {
-            _num = value;
-            UpdateNum();
-            UpdateNum1();
-        }
-    }
+        public List<Sprite> sprites = new();
+        public List<Image> coms = new();
+        public List<Image> overScore = new();
+        public List<Image> Clips = new();
 
-    public int Clip 
-	{
-		set
+        private int _num;
+        private int bullet;
+        public int Text
         {
-            bullet = value;
-            UpdateClip();
+            set
+            {
+                _num = value;
+                UpdateNum();
+                UpdateNum1();
+            }
         }
-        get { return bullet; }
-    }
-    private void Start()
-    {
-        Text = 0;
-    }
 
-    public void UpdateNum()
-    {
-        string[] ss = DefinitionScore(_num);
-        var nums = SplitDigits(ss);
-        for (int i = 0; i < coms.Count; i++)
+        public int Clip
         {
-            coms[i].sprite = sprites[nums[i]];
+            set
+            {
+                bullet = value;
+                UpdateClip();
+            }
+            get { return bullet; }
         }
-    }
-    public void UpdateNum1()
-    {
-        string[] ss = DefinitionScore(_num, 3);
-        var nums = SplitDigits(ss);
-        for (int i = 0; i < overScore.Count; i++)
+        private void Start()
         {
-            overScore[i].sprite = sprites[nums[i]];
+            Text = 0;
         }
-    }
-
-    public void UpdateClip()
-    {
-        //string[] ss = NumberBullets(bullet);
-        //var nums = SplitDigits(ss);
-        //for (int i = 0; i < Clips.Count; i++)
-        //{
-        //    Clips[i].sprite = sprites[nums[i]];
-        //}
-    }
 
-    public void ShowOverScore()
-    {
-        string[] ss = DefinitionScore(_num);
-        var nums = SplitDigits(ss);
-        for (int i = 0; i < coms.Count; i++)
+        public void UpdateNum()
         {
-            coms[i].sprite = sprites[nums[i]];
+            string[] ss = DefinitionScore(_num);
+            var nums = SplitDigits(ss);
+            for (int i = 0; i < coms.Count; i++)
+            {
+                coms[i].sprite = sprites[nums[i]];
+            }
         }
-    }
-
-    public List<int> SplitDigits(int num)
-    {
-        List<int> nums = new();
-        while (num > 0)
+        public void UpdateNum1()
         {
-            int digit = num % 10;
-            nums.Add(digit);
-            num /= 10;
+            string[] ss = DefinitionScore(_num, 3);
+            var nums = SplitDigits(ss);
+            for (int i = 0; i < overScore.Count; i++)
+            {
+                if (nums.Count > i)
+                {
+                    overScore[i].sprite = sprites[nums[i]];
+                    overScore[i].gameObject.SetActive(true);
+                }
+                else
+                    overScore[i].gameObject.SetActive(false);
+            }
         }
-        return nums;
-    }
-    public string[] NumberBullets(int num)
-    {
-        List<string> nub = new();
-        string ss = string.Format("{0:D2}", num);
-        for (int i = 0; i < ss.Length; i++)
+
+        public void UpdateClip()
         {
-            nub.Add(ss.Substring(i, 1));
+            //string[] ss = NumberBullets(bullet);
+            //var nums = SplitDigits(ss);
+            //for (int i = 0; i < Clips.Count; i++)
+            //{
+            //    Clips[i].sprite = sprites[nums[i]];
+            //}
         }
-        return nub.ToArray();
-    }
 
+        //public void ShowOverScore()
+        //{
+        //    string[] ss = DefinitionScore(_num);
+        //    var nums = SplitDigits(ss);
+        //    for (int i = 0; i < coms.Count; i++)
+        //    {
+        //        coms[i].sprite = sprites[nums[i]];
+        //    }
+        //}
 
-    public string[] DefinitionScore(int num, int count = 5)
-    {
-        List<string> nub = new();
-        string ss = "";
-        if (count == 5)
-            ss = string.Format("{0:D5}", num);
-        else if (count == 3)
-            ss = string.Format("{0:D3}", num);
-        for (int i = 0; i < ss.Length; i++)
+        //public List<int> SplitDigits(int num)
+        //{
+        //    List<int> nums = new();
+        //    while (num > 0)
+        //    {
+        //        int digit = num % 10;
+        //        nums.Add(digit);
+        //        num /= 10;
+        //    }
+        //    return nums;
+        //}
+
+        //public string[] NumberBullets(int num)
+        //{
+        //    List<string> nub = new();
+        //    string ss = string.Format("{0:D2}", num);
+        //    for (int i = 0; i < ss.Length; i++)
+        //    {
+        //        nub.Add(ss.Substring(i, 1));
+        //    }
+        //    return nub.ToArray();
+        //}
+
+
+        public string[] DefinitionScore(int num, int count = 5)
         {
-            nub.Add(ss.Substring(i, 1));
-        }
+            List<string> nub = new();
+            string ss = "";
+            if (count == 5)
+                ss = string.Format("{0:D5}", num);
+            else if (count == 3)
+                ss = string.Format("{0:D3}", num);
+            for (int i = 0; i < ss.Length; i++)
+            {
+                nub.Add(ss.Substring(i, 1));
+            }
 
-        return nub.ToArray();
-    }
+            return nub.ToArray();
+        }
 
-    public List<int> SplitDigits(string[] num)
-    {
-        List<int> nums = new();
-        foreach (var item in num)
+        public List<int> SplitDigits(string[] num)
         {
-            nums.Add(int.Parse(item));
+            List<int> nums = new();
+            foreach (var item in num)
+            {
+                nums.Add(int.Parse(item));
+            }
+            return nums;
         }
-        return nums;
     }
-}
-
-}
+}

Assets/Game_Hyperspace/Script/GeneratingTarget.cs

@@ -8,6 +8,7 @@ using UnityEngine.SceneManagement;
 using SmartBowSDK;
 using System;
 using HyperspaceGame;
+using MathNet.Numerics;
 
 public class GeneratingTarget : MonoBehaviour
 {
@@ -180,7 +181,7 @@ public class GeneratingTarget : MonoBehaviour
         BtnNext.onClick.AddListener(OnBtnNext);
         BtnNext.gameObject.SetActive(Index + 1 < MaxLevel);
         BtnLast.onClick.AddListener(OnBtnLast);
-        BtnLast.gameObject.SetActive(Index > 0);
+        BtnLast.gameObject.SetActive(true);
         GameOver.SetActive(false);
 		
 		CreateUIManager();
@@ -188,20 +189,26 @@ public class GeneratingTarget : MonoBehaviour
         CreateTargetObject2D();
     }
 
-    private void OnRestart()
+    public void OnRestart()
     {
         Restart(Index);
     }
 
-    private void OnBtnNext()
+    public void OnBtnNext()
     {
         Restart(Index + 1);
     }
 
-    private void OnBtnLast()
+    public void OnBtnLast()
     {
-        Restart(Index - 1);
+        //Restart(Index - 1);
         gm = null;
+
+        onUploadScore();
+        //结束游戏页面
+        userGameAnalyse1.UploadData(true);
+        userGameAnalyse1.onResetOverlayData();
+        SceneManager.LoadScene("Home", LoadSceneMode.Single);
     }
 
     void Start()
@@ -312,6 +319,9 @@ public class GeneratingTarget : MonoBehaviour
 
     private void DoShoot()
     {
+        if (shootingEvent.ShootUIBtn())
+            return;
+
         if (unload || clipsize <= 0)
         {
             Debug.Log("卸了弹夹 或者 没子弹了！");
@@ -496,7 +506,7 @@ public class GeneratingTarget : MonoBehaviour
     public void ShowScore()
     {
         //font.Text = score;
-        TopScore.text = score.ToString().PadLeft(6, '0');
+        TopScore.text = score.ToString().PadLeft(3, '0');
     }
     public Score scoreSprite;
     public void ShowScoreCom(int score, Vector3 pos, Vector2 scorepos, Transform tf, int posIdx)

Assets/Game_Hyperspace/Script/Move.cs

@@ -49,8 +49,6 @@ public abstract class Move
         var paddingRight = Math.Abs(halfW - (pos.x + radius));
         var paddingDown = Math.Abs(pos.y - radius - (-halfH));
 
-
-
         if (log)
             Debug.Log($"pos={pos}   paddingLeft={paddingLeft}  paddingTop={paddingTop}  paddingRight={paddingRight}  paddingDown={paddingDown}");
 
@@ -59,17 +57,21 @@ public abstract class Move
             return true;
 
         //上方170  右方133
-        if (paddingTop <= 170 && paddingRight >= 133)
+        if (paddingTop <= 170 && paddingRight <= 133)
             return true;
 
-        //下83  左方 370
-        if (paddingDown <= 83 && paddingLeft <= 370)
+        //下148  左方 370
+        if (paddingDown <= 148f && paddingLeft <= 370)
             return true;
 
         //下216  右方 133
         if (paddingDown <= 216 && paddingRight <= 330)
             return true;
 
+        //右方 133
+        if (paddingRight <= 133)
+            return true;
+
         return false;
     };
 
@@ -100,10 +102,10 @@ public abstract class Move
 /// <summary>
 /// 随机位置静止
 /// </summary>
-public class Stay: Move
+public class Stay : Move
 {
     public override void InitPos(List<SpineAnimationLoader> gos)
-    {        
+    {
         float ScaleX(float value)
         {
             var width = ScreenWidth();
@@ -167,7 +169,7 @@ public class RightToLeft : Move
         {
             var randomPos = gos[i].GetRandomPos(PosType.Right);
             int count = RamdomNum;
-            while (IsUIBlock(gos[i], randomPos, false) || CheckOverLap(gos[i], randomPos) && count > 0)
+            while (CheckOverLap(gos[i], randomPos) && count > 0)
             {
                 randomPos = gos[i].GetRandomPos(PosType.Right);
                 count--;
@@ -194,7 +196,7 @@ public class RelativeHor : Move
             var tempPos = i % 2 == 0 ? PosType.Left : PosType.Right;
             var randomPos = gos[i].GetRandomPos(tempPos);
             int count = RamdomNum;
-            while (IsUIBlock(gos[i], randomPos, false) || CheckOverLap(gos[i], randomPos) && count > 0)
+            while (CheckOverLap(gos[i], randomPos) && count > 0)
             {
                 randomPos = gos[i].GetRandomPos(tempPos);
                 count--;
@@ -406,7 +408,7 @@ public class VET : Move
 /// </summary>
 public class ROT : Move, IUpdate
 {
-    private float speed; 
+    private float speed;
 
     public override void InitPos(List<SpineAnimationLoader> gos)
     {

Assets/Game_Hyperspace/Script/ShootingEvent.cs

@@ -82,6 +82,30 @@ public class ShootingEvent : MonoBehaviour
         UpdateCrossHairPosition();
     }
 
+    /// <summary>
+    /// ÅжÏÊÇ·ñ´òÖÐUI°´Å¥
+    /// </summary>
+    /// <returns></returns>
+    public bool ShootUIBtn()
+    {
+        var ray = new Ray(transform.position, transform.forward);
+        RaycastHit hitInfo;
+        if (Physics.Raycast(ray, out hitInfo))
+        {
+            var go = hitInfo.transform.gameObject;
+            if (go.GetComponent<Button>())
+            {
+                if (go.name == "BtnRestart")
+                    GeneratingTarget.gm.OnRestart();
+                else if (go.name == "BtnNext")
+                    GeneratingTarget.gm.OnBtnNext();
+                else if (go.name == "BtnLast")
+                    GeneratingTarget.gm.OnBtnLast();
+            }
+        }
+        return false;
+    }
+
     private void Update()
     {
         Ray ray = new Ray(transform.position, transform.forward);

Assets/Game_Hyperspace/StompyRobot/SRDebugger/Scripts/Settings.cs

@@ -572,7 +572,7 @@ namespace SRDebugger
 
         #region Serialization
 
-        [SerializeField] private bool _isEnabled = true;
+        [SerializeField] private bool _isEnabled = false;
 
         [SerializeField] private bool _disableWelcomePopup = false;