shurongsen/Cute_demon_attacks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
liuliang 2025-01-07 21:29:23 +08:00
parent 54adb9bd5a
commit d25ee64926
5 changed files with 374 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
meng_yao/Assets/Prefabs/ui/scene_main/Battle_Selection.prefab
View File

@ -951,10 +951,10 @@ RectTransform:
m_Father: {fileID: 8646173537342263721} m_Father: {fileID: 8646173537342263721}
m_RootOrder: 7 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 380.34, y: -174.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 264, y: 349} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1384521942092389828 --- !u!222 &1384521942092389828
CanvasRenderer: CanvasRenderer:
@ -2702,7 +2702,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &8358514659536348924 --- !u!224 &8358514659536348924
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2720,10 +2720,10 @@ RectTransform:
m_Father: {fileID: 8646173537342263721} m_Father: {fileID: 8646173537342263721}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 628.68, y: -174.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 264, y: 349} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &514399549474802177 --- !u!222 &514399549474802177
CanvasRenderer: CanvasRenderer:
@ -3320,7 +3320,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &2326313618895737026 --- !u!224 &2326313618895737026
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3339,10 +3339,10 @@ RectTransform:
m_Father: {fileID: 8646173537342263721} m_Father: {fileID: 8646173537342263721}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 877.02, y: -174.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 264, y: 349} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1697601538235407773 --- !u!222 &1697601538235407773
CanvasRenderer: CanvasRenderer:
@ -3862,7 +3862,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &7746894664056376433 --- !u!224 &7746894664056376433
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3880,10 +3880,10 @@ RectTransform:
m_Father: {fileID: 8646173537342263721} m_Father: {fileID: 8646173537342263721}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 132, y: -174.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 264, y: 349} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7365051608687316327 --- !u!222 &7365051608687316327
CanvasRenderer: CanvasRenderer:
@ -4399,10 +4399,10 @@ RectTransform:
m_Father: {fileID: 8646173537342263721} m_Father: {fileID: 8646173537342263721}
m_RootOrder: 8 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 628.68, y: -174.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 264, y: 349} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4664660864740528634 --- !u!222 &4664660864740528634
CanvasRenderer: CanvasRenderer:
@ -4706,10 +4706,10 @@ RectTransform:
m_Father: {fileID: 8646173537342263721} m_Father: {fileID: 8646173537342263721}
m_RootOrder: 6 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 132, y: -174.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 264, y: 349} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5149107496789374916 --- !u!222 &5149107496789374916
CanvasRenderer: CanvasRenderer:
@ -5117,7 +5117,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &8877446926102637512 --- !u!224 &8877446926102637512
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5135,10 +5135,10 @@ RectTransform:
m_Father: {fileID: 8646173537342263721} m_Father: {fileID: 8646173537342263721}
m_RootOrder: 5 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 380.34, y: -174.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 264, y: 349} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3385889476137030960 --- !u!222 &3385889476137030960
CanvasRenderer: CanvasRenderer:
@ -5550,7 +5550,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &1057291538616115112 --- !u!224 &1057291538616115112
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5568,10 +5568,10 @@ RectTransform:
m_Father: {fileID: 8646173537342263721} m_Father: {fileID: 8646173537342263721}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 132, y: -174.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 264, y: 349} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1106133910927903845 --- !u!222 &1106133910927903845
CanvasRenderer: CanvasRenderer:
@ -6165,7 +6165,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &614702616468430087 --- !u!224 &614702616468430087
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -6183,10 +6183,10 @@ RectTransform:
m_Father: {fileID: 8646173537342263721} m_Father: {fileID: 8646173537342263721}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 380.34, y: -174.5} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 264, y: 349} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6130671505914922423 --- !u!222 &6130671505914922423
CanvasRenderer: CanvasRenderer:

14
meng_yao/Assets/Resources/Prefabs/GameplayPlane.prefab
View File

@ -30,12 +30,12 @@ RectTransform:
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 8266668363385741884} m_Father: {fileID: 8266668361936784970}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 170, y: -63} m_AnchoredPosition: {x: -628, y: 1572}
m_SizeDelta: {x: 171.49872, y: 42.122437} m_SizeDelta: {x: 171.49872, y: 42.122437}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6486587076804007013 --- !u!222 &6486587076804007013
@ -111,7 +111,7 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 8266668363385741884} m_Father: {fileID: 8266668363385741884}
m_RootOrder: 1 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
@ -186,9 +186,10 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 6486587076804007015}
m_Father: {fileID: 8266668363385741884} m_Father: {fileID: 8266668363385741884}
m_RootOrder: 2 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -308,7 +309,7 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 8266668363385741884} m_Father: {fileID: 8266668363385741884}
m_RootOrder: 3 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -387,7 +388,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 6486587076804007015}
- {fileID: 6486587076853413869} - {fileID: 6486587076853413869}
- {fileID: 8266668361936784970} - {fileID: 8266668361936784970}
- {fileID: 8266668362755610848} - {fileID: 8266668362755610848}

4
meng_yao/Assets/Scenes/New/Scene_map_1.unity
View File

@ -5119,10 +5119,10 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 0 m_MinSize: 0
m_MaxSize: 60 m_MaxSize: 60
m_Alignment: 5 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 1
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 0/20 m_Text: 0/20

680
meng_yao/Assets/Scenes/scene_Main.unity
View File

File diff suppressed because it is too large Load Diff

8
meng_yao/Assets/script/scene_jinshakuang/minerControl.cs
View File

@ -72,17 +72,21 @@ public class minerControl : MonoBehaviour
// 等待移动完成 // 等待移动完成
await MoveToEndPositionAsync(endPos.position); await MoveToEndPositionAsync(endPos.position);
// ÍÚ¿ó²Ù×÷
dig();
} }
private async System.Threading.Tasks.Task MoveToEndPositionAsync(Vector3 targetPosition) private async System.Threading.Tasks.Task MoveToEndPositionAsync(Vector3 targetPosition)
{ {
SetState(minerState.move);
// 使用 DOTween 进行移动，并等待动画完成 // 使用 DOTween 进行移动，并等待动画完成
Tweener tweener = transform.DOMove(targetPosition, 3f); Tweener tweener = transform.DOMove(targetPosition, 3f);
// 等待动画完成 // 等待动画完成
await tweener.AsyncWaitForCompletion(); await tweener.AsyncWaitForCompletion();
// ÍÚ¿ó²Ù×÷
dig();
} }
public void SetState(minerState newState) public void SetState(minerState newState)