diff --git a/meng_yao/Assets/Prefabs/ui/Beat_ZanTing.prefab b/meng_yao/Assets/Prefabs/ui/Beat_ZanTing.prefab index 75c1acbb..0e167edd 100644 --- a/meng_yao/Assets/Prefabs/ui/Beat_ZanTing.prefab +++ b/meng_yao/Assets/Prefabs/ui/Beat_ZanTing.prefab @@ -850,8 +850,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 462.18054, y: -1101.9258} - m_SizeDelta: {x: 725.2872, y: 0} + m_AnchoredPosition: {x: 462.18054, y: -1051.9258} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5361498673185763723 MonoBehaviour: diff --git a/meng_yao/Assets/Prefabs/ui/load.meta b/meng_yao/Assets/Prefabs/ui/load.meta new file mode 100644 index 00000000..08b563b1 --- /dev/null +++ b/meng_yao/Assets/Prefabs/ui/load.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c54423c9f9fd926409e5a673ad9b4282 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/Prefabs/ui/load/loadingPanel.prefab b/meng_yao/Assets/Prefabs/ui/load/loadingPanel.prefab new file mode 100644 index 00000000..163303c8 --- /dev/null +++ b/meng_yao/Assets/Prefabs/ui/load/loadingPanel.prefab @@ -0,0 +1,213 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6870665345490481988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6870665345490481989} + - component: {fileID: 6870665345490481995} + - component: {fileID: 6870665345490481994} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6870665345490481989 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870665345490481988} + 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: 6870665346359048690} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6870665345490481995 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870665345490481988} + m_CullTransparentMesh: 1 +--- !u!114 &6870665345490481994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870665345490481988} + 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: 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 5 + m_MaxSize: 127 + m_Alignment: 7 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!1 &6870665346359048685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6870665346359048690} + - component: {fileID: 6870665346359048691} + m_Layer: 5 + m_Name: loadingPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6870665346359048690 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870665346359048685} + 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: + - {fileID: 6870665346376107586} + - {fileID: 6870665345490481989} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6870665346359048691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870665346359048685} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93d59193d3d19fd42b350d0b7c2e29b5, type: 3} + m_Name: + m_EditorClassIdentifier: + targetText: {fileID: 6870665345490481994} + fullText: "\u6B63\u5728\u52A0\u8F7D\uFF0C\u8BF7\u7A0D\u5019..." + typewriterDelay: 0.1 + SceneIndex: 0 +--- !u!1 &6870665346376107645 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6870665346376107586} + - component: {fileID: 6870665346376107584} + - component: {fileID: 6870665346376107587} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6870665346376107586 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870665346376107645} + 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: 6870665346359048690} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6870665346376107584 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870665346376107645} + m_CullTransparentMesh: 1 +--- !u!114 &6870665346376107587 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870665346376107645} + 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: 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_Sprite: {fileID: 0} + 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 diff --git a/meng_yao/Assets/Prefabs/ui/load/loadingPanel.prefab.meta b/meng_yao/Assets/Prefabs/ui/load/loadingPanel.prefab.meta new file mode 100644 index 00000000..a09e129e --- /dev/null +++ b/meng_yao/Assets/Prefabs/ui/load/loadingPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6839835fa4bd9ee4082efffc9eccc703 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/Prefabs/ui/scene_main/Battle_Selection.prefab b/meng_yao/Assets/Prefabs/ui/scene_main/Battle_Selection.prefab index 548dfa31..310e746e 100644 --- a/meng_yao/Assets/Prefabs/ui/scene_main/Battle_Selection.prefab +++ b/meng_yao/Assets/Prefabs/ui/scene_main/Battle_Selection.prefab @@ -3170,6 +3170,8 @@ MonoBehaviour: scaleUpDuration: 0.4 tiaoScene: {fileID: 8646173536183414967} Btns: [] + _staminaBar: {fileID: 0} + loadPanelPrefab: {fileID: 6870665346359048685, guid: 6839835fa4bd9ee4082efffc9eccc703, type: 3} --- !u!1 &8646173536251712116 GameObject: m_ObjectHideFlags: 0 diff --git a/meng_yao/Assets/common b/meng_yao/Assets/common index 53e24b62..bf88fb96 160000 --- a/meng_yao/Assets/common +++ b/meng_yao/Assets/common @@ -1 +1 @@ -Subproject commit 53e24b624e206126bddcc2e0d8399a442d741901 +Subproject commit bf88fb96a3125ef91388146665eeab8f80aa2f25 diff --git a/meng_yao/Assets/script/A_Fight/SkillUp/laohuSkillUp.cs b/meng_yao/Assets/script/A_Fight/SkillUp/laohuSkillUp.cs index 1836d650..44b1aa9f 100644 --- a/meng_yao/Assets/script/A_Fight/SkillUp/laohuSkillUp.cs +++ b/meng_yao/Assets/script/A_Fight/SkillUp/laohuSkillUp.cs @@ -12,7 +12,7 @@ public class laohuSkillUp :SkillUp /// public override void Skill_1_1() { - base.AttackRange += 2; + base.AttackRange = 2; attack.SetAttackRange(); Debug.LogError("使用技能1-1"); } @@ -21,7 +21,7 @@ public class laohuSkillUp :SkillUp /// public override void Skill_1_3() { - base.AttackRange += -1; + base.AttackRange = -1; attack.SetAttackRange(); // 创建一个眩晕 Buff(持续1秒,20%概率) Action decelerationBuff = CreateDecelerationBuff(1f, 0.2f); diff --git a/meng_yao/Assets/script/A_Fight/SkillUp/mkl_SkillUp.cs b/meng_yao/Assets/script/A_Fight/SkillUp/mkl_SkillUp.cs index ca5306a3..35f7c344 100644 --- a/meng_yao/Assets/script/A_Fight/SkillUp/mkl_SkillUp.cs +++ b/meng_yao/Assets/script/A_Fight/SkillUp/mkl_SkillUp.cs @@ -44,7 +44,7 @@ public class mkl_SkillUp : SkillUp public override void Skill_2_3() { base.DamageOfMin += 0.25f; - base.AttackRange += -1; + base.AttackRange = -1; attack.SetAttackRange(); } /// diff --git a/meng_yao/Assets/script/UI_prefabs/Battle_Selection.cs b/meng_yao/Assets/script/UI_prefabs/Battle_Selection.cs index 7280edc3..56cd6d68 100644 --- a/meng_yao/Assets/script/UI_prefabs/Battle_Selection.cs +++ b/meng_yao/Assets/script/UI_prefabs/Battle_Selection.cs @@ -35,7 +35,9 @@ public class Battle_Selection : BaseUI public List