From 1c5dad37b21b034bd9169169f1a1bbf5c92e8cd0 Mon Sep 17 00:00:00 2001 From: 45 <980269297@qq.com> Date: Mon, 4 Aug 2025 11:14:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=8C=E4=BA=BA=E5=8D=A1=E7=BB=84ui0804?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Prefab/EnemyCardPrefab.meta | 8 + .../Prefab/EnemyCardPrefab/EnemyCard.prefab | 233 +++ .../EnemyCardPrefab/EnemyCard.prefab.meta | 7 + .../Prefab/RewardTip/RelicReward.prefab | 166 +- .../Assets/Scenes/SampleScene.unity | 1513 ++++++++++++++++- .../Assets/Scenes/StartMainScence.unity | 20 +- .../Scripts/AttackScore/AttackScorManager.cs | 32 +- .../Assets/Scripts/Enemy/Enemy.cs | 44 +- .../Assets/Scripts/Enemy/EnemyCard.cs | 3 +- .../PlayCard/EnemyPlayerCardUIManager.cs | 3 +- .../Assets/Scripts/Enemy/ShowEnemyDeck.cs | 46 + .../Scripts/Enemy/ShowEnemyDeck.cs.meta | 11 + .../Assets/Scripts/GameManager.cs | 58 +- .../Assets/Scripts/Weapon/WeaponManager.cs | 13 + .../Assets/Scripts/Weapon/WeaponNode.cs | 3 + 15 files changed, 2108 insertions(+), 52 deletions(-) create mode 100644 ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab/EnemyCard.prefab create mode 100644 ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab/EnemyCard.prefab.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/ShowEnemyDeck.cs create mode 100644 ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/ShowEnemyDeck.cs.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab.meta new file mode 100644 index 00000000..87ce5f00 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 278141ccb82b0764abbb831de35f42e9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab/EnemyCard.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab/EnemyCard.prefab new file mode 100644 index 00000000..2e4ac4f0 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab/EnemyCard.prefab @@ -0,0 +1,233 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2164375220746341275 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7844100700305095097} + - component: {fileID: 2698200776871774953} + - component: {fileID: 2632894681187877082} + 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 &7844100700305095097 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2164375220746341275} + 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: 4708247228734791050} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000030517578, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2698200776871774953 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2164375220746341275} + m_CullTransparentMesh: 1 +--- !u!114 &2632894681187877082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2164375220746341275} + 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: 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: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 108 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: X +--- !u!1 &2851390917020499219 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4708247228734791050} + - component: {fileID: 700278776622380886} + - component: {fileID: 3824413123567589468} + m_Layer: 5 + m_Name: DisMaskImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4708247228734791050 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2851390917020499219} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000056082215} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7844100700305095097} + m_Father: {fileID: 8013579619966043593} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000030517578, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &700278776622380886 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2851390917020499219} + m_CullTransparentMesh: 1 +--- !u!114 &3824413123567589468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2851390917020499219} + 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: 0.78431374} + m_RaycastTarget: 0 + 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 +--- !u!1 &5488427976241108427 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8013579619966043593} + - component: {fileID: 8778626249013257331} + - component: {fileID: 3750999967405702493} + m_Layer: 5 + m_Name: EnemyCard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8013579619966043593 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5488427976241108427} + 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: 4708247228734791050} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 170, y: -170} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8778626249013257331 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5488427976241108427} + m_CullTransparentMesh: 1 +--- !u!114 &3750999967405702493 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5488427976241108427} + 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: 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/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab/EnemyCard.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab/EnemyCard.prefab.meta new file mode 100644 index 00000000..2787638f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyCardPrefab/EnemyCard.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b4269360e36ee9e49becd4021ec00f97 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/RelicReward.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/RelicReward.prefab index 190cef0a..8ae32b77 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/RelicReward.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/RelicReward.prefab @@ -150,6 +150,156 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1940003937405211964 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6273709181233876595} + - component: {fileID: 4261442503438008653} + - component: {fileID: 3090777398203095122} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6273709181233876595 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1940003937405211964} + 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: 73226582809733933} + 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, y: 120.6} + m_SizeDelta: {x: 500, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4261442503438008653 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1940003937405211964} + m_CullTransparentMesh: 1 +--- !u!114 &3090777398203095122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1940003937405211964} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2417b4f61de715a4bb4c632aeed5fd8b, 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!1 &6645390030520431729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6147733292761466666} + - component: {fileID: 366954496476915652} + - component: {fileID: 5126936418478906587} + m_Layer: 0 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6147733292761466666 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6645390030520431729} + 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: 73226582809733933} + 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, y: -120.1} + m_SizeDelta: {x: 500, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &366954496476915652 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6645390030520431729} + m_CullTransparentMesh: 1 +--- !u!114 &5126936418478906587 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6645390030520431729} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 46214e882f723bd428dd16c48f15a94c, 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!1 &6978259832841498792 GameObject: m_ObjectHideFlags: 0 @@ -392,6 +542,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8046344663846924764} + - {fileID: 6273709181233876595} + - {fileID: 6147733292761466666} m_Father: {fileID: 5883788949264027352} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -420,15 +572,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 6f1a9652ce8517f42b2c19c45da9236e, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -518,7 +670,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + 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 @@ -526,19 +678,19 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 9a3e41c5dbfbbf64e9816d4e123e3f77, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: New Text + m_Text: "\u9057\u7269\u63CF\u8FF0" --- !u!1 &8550563113017744413 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 8b76e7fc..998e2b33 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -1751,6 +1751,7 @@ GameObject: - component: {fileID: 39355698} - component: {fileID: 39355697} - component: {fileID: 39355700} + - component: {fileID: 39355701} m_Layer: 5 m_Name: SwitchButton m_TagString: Untagged @@ -1885,6 +1886,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: anim: {fileID: 492599856} +--- !u!225 &39355701 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39355695} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &39378526 GameObject: m_ObjectHideFlags: 0 @@ -2394,6 +2407,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 60638989} m_CullTransparentMesh: 1 +--- !u!1 &61303441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 61303442} + - component: {fileID: 61303444} + - component: {fileID: 61303443} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &61303442 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61303441} + 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: 1167435604} + 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, y: 0} + m_SizeDelta: {x: 70, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &61303443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61303441} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 945ce1cb72eb95840b94268b73cd2468, 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 &61303444 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61303441} + m_CullTransparentMesh: 1 --- !u!1 &71212959 GameObject: m_ObjectHideFlags: 0 @@ -5457,6 +5545,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 129430295} m_CullTransparentMesh: 1 +--- !u!1 &129784904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 129784905} + - component: {fileID: 129784907} + - component: {fileID: 129784906} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &129784905 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129784904} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00006902418} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 853962873} + 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.72992, y: 2.4450073} + m_SizeDelta: {x: 218.18, y: 132.63} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &129784906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129784904} + 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: 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: 9a3e41c5dbfbbf64e9816d4e123e3f77, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 60 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u654C\u4EBA\u5361" +--- !u!222 &129784907 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129784904} + m_CullTransparentMesh: 1 --- !u!1 &129931011 GameObject: m_ObjectHideFlags: 0 @@ -6211,6 +6378,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 142863955} m_CullTransparentMesh: 1 +--- !u!1 &146502318 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 146502319} + - component: {fileID: 146502322} + - component: {fileID: 146502321} + - component: {fileID: 146502320} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &146502319 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146502318} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000034512086} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1642602660} + m_Father: {fileID: 914075318} + 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: -29.2, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &146502320 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146502318} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &146502321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146502318} + 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: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &146502322 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146502318} + m_CullTransparentMesh: 1 --- !u!1 &151577779 GameObject: m_ObjectHideFlags: 0 @@ -7914,6 +8171,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 197216735} m_CullTransparentMesh: 1 +--- !u!1 &201181656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 201181657} + - component: {fileID: 201181660} + - component: {fileID: 201181659} + - component: {fileID: 201181658} + m_Layer: 5 + m_Name: OpenEnemyDeckButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &201181657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 201181656} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00002588391} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 317329458} + m_Father: {fileID: 1066351357} + 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: -100.00003} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &201181658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 201181656} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 201181659} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1647403363} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 +--- !u!114 &201181659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 201181656} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &201181660 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 201181656} + m_CullTransparentMesh: 1 --- !u!1 &202689438 GameObject: m_ObjectHideFlags: 0 @@ -12297,7 +12687,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.49019608} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -18207,6 +18597,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 316611329} m_CullTransparentMesh: 1 +--- !u!1 &317329457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 317329458} + - component: {fileID: 317329460} + - component: {fileID: 317329459} + 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 &317329458 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 317329457} + 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: 201181657} + 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 &317329459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 317329457} + 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.19607843, g: 0.19607843, b: 0.19607843, 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: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6253\u5F00\u5361\u7EC4" +--- !u!222 &317329460 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 317329457} + m_CullTransparentMesh: 1 --- !u!1 &318826752 GameObject: m_ObjectHideFlags: 0 @@ -18709,8 +19178,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0.50640994, y: 0, z: 0, w: 0.8622928} - m_LocalPosition: {x: 3.6, y: 10.75, z: -3.54} + m_LocalRotation: {x: 0.60876137, y: 0, z: 0, w: 0.7933534} + m_LocalPosition: {x: 3.6, y: 11.6, z: -0.33} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -34796,15 +35265,15 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 699857786} serializedVersion: 2 - m_LocalRotation: {x: 0.50640994, y: 0, z: 0, w: 0.8622928} - m_LocalPosition: {x: 3.6, y: 10.75, z: -3.54} + m_LocalRotation: {x: 0.60876137, y: 0, z: 0, w: 0.7933534} + m_LocalPosition: {x: 3.6, y: 11.6, z: -0.33} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 328654747} - {fileID: 1098880431} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 60.85, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 75, y: 0, z: 0} --- !u!114 &699857789 MonoBehaviour: m_ObjectHideFlags: 0 @@ -41510,6 +41979,7 @@ RectTransform: - {fileID: 1099770463} - {fileID: 1449930830} - {fileID: 1066351357} + - {fileID: 1647403364} m_Father: {fileID: 1915587657} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -41866,6 +42336,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 849144528} m_CullTransparentMesh: 1 +--- !u!1 &853962872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 853962873} + - component: {fileID: 853962875} + - component: {fileID: 853962874} + m_Layer: 7 + m_Name: NamePanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &853962873 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853962872} + 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: 1520560961} + - {fileID: 129784905} + m_Father: {fileID: 1647403364} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -628.24, y: -151.53998} + m_SizeDelta: {x: 241.65, y: 74.21} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &853962874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853962872} + 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: c078cec221f897349bc6327115f8fba0, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 5 +--- !u!222 &853962875 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853962872} + m_CullTransparentMesh: 1 --- !u!1 &854898562 GameObject: m_ObjectHideFlags: 0 @@ -43144,7 +43691,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.49019608} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -43876,6 +44423,113 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &914075317 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 914075318} + - component: {fileID: 914075321} + - component: {fileID: 914075320} + - component: {fileID: 914075319} + m_Layer: 5 + m_Name: MainGroundScroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &914075318 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914075317} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000056082} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 146502319} + m_Father: {fileID: 933195151} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000061035156, y: 0.000030517578} + m_SizeDelta: {x: 0, y: 0.000061035} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &914075319 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914075317} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1642602660} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 45 + m_Viewport: {fileID: 146502319} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &914075320 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914075317} + 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: 0} + 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: -1040661376, guid: cde2eb21897fa2946b340fe7d4a43111, 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 &914075321 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914075317} + m_CullTransparentMesh: 1 --- !u!1 &919470026 GameObject: m_ObjectHideFlags: 0 @@ -44594,6 +45248,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 932087904} m_CullTransparentMesh: 1 +--- !u!1 &933195150 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 933195151} + - component: {fileID: 933195153} + - component: {fileID: 933195152} + m_Layer: 5 + m_Name: MainViewGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &933195151 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 933195150} + 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: 914075318} + m_Father: {fileID: 1647403364} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -92, y: 58.5} + m_SizeDelta: {x: -555.6, y: -497.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &933195152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 933195150} + 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: 6f1a9652ce8517f42b2c19c45da9236e, 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 &933195153 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 933195150} + m_CullTransparentMesh: 1 --- !u!1 &936789559 GameObject: m_ObjectHideFlags: 0 @@ -46491,6 +47221,81 @@ RectTransform: m_AnchoredPosition: {x: 291, y: -26.699898} m_SizeDelta: {x: 70.7, y: 57.33} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &966097119 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 966097120} + - component: {fileID: 966097122} + - component: {fileID: 966097121} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &966097120 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 966097119} + 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: 1625351731} + 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, y: 0} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &966097121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 966097119} + 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: 0.49019608} + m_RaycastTarget: 0 + 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 +--- !u!222 &966097122 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 966097119} + m_CullTransparentMesh: 1 --- !u!1 &967334092 GameObject: m_ObjectHideFlags: 0 @@ -49770,7 +50575,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.49019608} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -50360,6 +51165,7 @@ GameObject: - component: {fileID: 1066351357} - component: {fileID: 1066351356} - component: {fileID: 1066351355} + - component: {fileID: 1066351358} m_Layer: 5 m_Name: EnemyShowCard m_TagString: Untagged @@ -50416,7 +51222,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0.000060396} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 201181657} m_Father: {fileID: 846544929} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -50424,6 +51231,21 @@ RectTransform: m_AnchoredPosition: {x: 707, y: 324.7} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1066351358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066351354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 670f77706c43dbe4bacfe8ebd00441aa, type: 3} + m_Name: + m_EditorClassIdentifier: + cardDeck: {fileID: 1647403363} + isLock: 0 + isOn: 0 --- !u!1 &1071114257 GameObject: m_ObjectHideFlags: 0 @@ -54277,6 +55099,163 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1166617612} m_CullTransparentMesh: 1 +--- !u!1 &1167435603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1167435604} + - component: {fileID: 1167435607} + - component: {fileID: 1167435606} + - component: {fileID: 1167435605} + m_Layer: 5 + m_Name: Back + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1167435604 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167435603} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000020492} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 61303442} + m_Father: {fileID: 1647403364} + 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: 487.59003, y: 350.1} + m_SizeDelta: {x: 140, y: 140} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1167435605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167435603} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.6509804} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1167435606} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1647403363} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1731567177} + m_TargetAssemblyTypeName: UIAudio, Assembly-CSharp + m_MethodName: MenuClosePlayer + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1607756702} + m_TargetAssemblyTypeName: HideUIBarManager, Assembly-CSharp + m_MethodName: ShowUIBar + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1167435606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167435603} + 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: 7aed610e3ffe5b24db660525833d909a, 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 &1167435607 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167435603} + m_CullTransparentMesh: 1 --- !u!1 &1168642059 GameObject: m_ObjectHideFlags: 0 @@ -66155,6 +67134,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1464964524} m_CullTransparentMesh: 1 +--- !u!1 &1465721968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1465721969} + - component: {fileID: 1465721971} + - component: {fileID: 1465721970} + m_Layer: 7 + m_Name: "\u4E0A\u6846" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1465721969 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1465721968} + 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: 1647403364} + 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: -92.29, y: 350.1} + m_SizeDelta: {x: 1412.91, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1465721970 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1465721968} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2417b4f61de715a4bb4c632aeed5fd8b, 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 &1465721971 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1465721968} + m_CullTransparentMesh: 1 --- !u!1 &1467105164 GameObject: m_ObjectHideFlags: 3 @@ -68791,6 +69845,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1515175091} m_CullTransparentMesh: 1 +--- !u!1 &1520560960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1520560961} + - component: {fileID: 1520560963} + - component: {fileID: 1520560962} + m_Layer: 7 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1520560961 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1520560960} + 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: 1659561583} + m_Father: {fileID: 853962873} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 75, y: 75} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1520560962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1520560960} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7aed610e3ffe5b24db660525833d909a, 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 &1520560963 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1520560960} + m_CullTransparentMesh: 1 --- !u!1 &1522084902 GameObject: m_ObjectHideFlags: 0 @@ -76205,6 +77335,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a8bcecd86a4bbbd42b662c5ee02ea8d2, type: 3} m_Name: m_EditorClassIdentifier: + cardFather: {fileID: 1642602660} + cardPrefab: {fileID: 5488427976241108427, guid: b4269360e36ee9e49becd4021ec00f97, + type: 3} currentEnemyHP: 60 maxEnemyHP: 60 --- !u!4 &1584057329 @@ -77843,6 +78976,7 @@ RectTransform: m_Children: - {fileID: 35264500} - {fileID: 2140385644} + - {fileID: 966097120} m_Father: {fileID: 595819630} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -77862,7 +78996,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d6302809f06dc36468787c81c4c492aa, type: 3} m_Name: m_EditorClassIdentifier: - enableVFX: {fileID: 0} + enableVFX: {fileID: 966097119} inforPanel: {fileID: 35264499} nameText: {fileID: 281561567} inforText: {fileID: 2136444647} @@ -78753,6 +79887,206 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1642155874} m_CullTransparentMesh: 1 +--- !u!1 &1642602659 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1642602660} + - component: {fileID: 1642602662} + - component: {fileID: 1642602661} + m_Layer: 5 + m_Name: CardContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1642602660 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1642602659} + 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: 146502319} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1899} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1642602661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1642602659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c28e6c7109d95c841a7143f6a4d10cb0, type: 3} + m_Name: + m_EditorClassIdentifier: + cardList: [] + cardGameObjectList: [] + cardScale: {x: 1.5, y: 1.5, z: 1.5} +--- !u!114 &1642602662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1642602659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 70 + m_Right: 0 + m_Top: 70 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 200, y: 200} + m_Spacing: {x: 45, y: 45} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &1647403363 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1647403364} + - component: {fileID: 1647403368} + - component: {fileID: 1647403367} + - component: {fileID: 1647403366} + - component: {fileID: 1647403365} + m_Layer: 7 + m_Name: EnemyCardDeck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1647403364 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647403363} + 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: 933195151} + - {fileID: 1465721969} + - {fileID: 1667012848} + - {fileID: 853962873} + - {fileID: 1167435604} + m_Father: {fileID: 846544929} + 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.000015259, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &1647403365 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647403363} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e7b8584ffc2c93b44a1f1c64c68978e0, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!65 &1647403366 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647403363} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 2000, y: 1100, z: 1} + m_Center: {x: 0, y: 0, z: 20} +--- !u!114 &1647403367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647403363} + m_Enabled: 0 + 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: 0.5882353} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1647403368 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647403363} + m_CullTransparentMesh: 1 --- !u!1 &1648198276 GameObject: m_ObjectHideFlags: 0 @@ -79001,6 +80335,81 @@ MonoBehaviour: black: {r: 0.50980395, g: 0.28627452, b: 0.27058825, a: 1} originColor: {r: 1, g: 1, b: 1, a: 1} speed: 2 +--- !u!1 &1659561582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1659561583} + - component: {fileID: 1659561585} + - component: {fileID: 1659561584} + m_Layer: 7 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1659561583 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1659561582} + m_LocalRotation: {x: 0, y: 0, z: 0.17364816, w: 0.9848078} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1520560961} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -1.2000008, y: 0} + m_SizeDelta: {x: 55.39, y: 78.05} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1659561584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1659561582} + 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: be0beb29830547a4ab11c1ffab524991, 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 &1659561585 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1659561582} + m_CullTransparentMesh: 1 --- !u!1 &1659862523 GameObject: m_ObjectHideFlags: 0 @@ -79457,6 +80866,81 @@ RectTransform: m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: -10, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1667012847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1667012848} + - component: {fileID: 1667012850} + - component: {fileID: 1667012849} + m_Layer: 7 + m_Name: "\u4E0B\u6846" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1667012848 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1667012847} + 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: 1647403364} + 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: -92.29, y: -231} + m_SizeDelta: {x: 1412.91, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1667012849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1667012847} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2417b4f61de715a4bb4c632aeed5fd8b, 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 &1667012850 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1667012847} + m_CullTransparentMesh: 1 --- !u!1 &1667708188 GameObject: m_ObjectHideFlags: 0 @@ -86457,10 +87941,11 @@ MonoBehaviour: isScorSettle: 1 playerScore: 0 enemyScore: 0 - straightHit: 0 + straightHit: 1 attackPattern: {fileID: 2135474817} defenseIcon: {fileID: 21300000, guid: 8fd74ffa775b75741a21abd9250e2767, type: 3} attackIcon: {fileID: 21300000, guid: 0a1daf24126ecb54e87fbf1dbf3cec7b, type: 3} + attackHitTypeCanvasGroup: {fileID: 39355701} scorResults: 0 playerScoreBar: {fileID: 93681350} playerScoreText: {fileID: 1259852126} @@ -93911,7 +95396,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.49019608} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -98096,7 +99581,7 @@ Transform: m_GameObject: {fileID: 2111055196} serializedVersion: 2 m_LocalRotation: {x: 0.50640994, y: 0, z: 0, w: 0.8622928} - m_LocalPosition: {x: 3.6007, y: -0.5993, z: 2.5936} + m_LocalPosition: {x: 3.6007, y: -0.92, z: 2.01} m_LocalScale: {x: 0.21393806, y: 0.21441236, z: 0.22112942} m_ConstrainProportionsScale: 0 m_Children: [] @@ -98851,7 +100336,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8fd74ffa775b75741a21abd9250e2767, type: 3} + m_Sprite: {fileID: 21300000, guid: 0a1daf24126ecb54e87fbf1dbf3cec7b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity index ae5bcbe4..a834bf0b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity @@ -9090,7 +9090,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8fd74ffa775b75741a21abd9250e2767, type: 3} + m_Sprite: {fileID: 21300000, guid: 0a1daf24126ecb54e87fbf1dbf3cec7b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -24352,6 +24352,7 @@ GameObject: - component: {fileID: 1010647078} - component: {fileID: 1010647077} - component: {fileID: 1010647076} + - component: {fileID: 1010647080} m_Layer: 5 m_Name: SwitchButton m_TagString: Untagged @@ -24436,7 +24437,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 2079222900} m_TargetAssemblyTypeName: AttackScorManager, Assembly-CSharp m_MethodName: ChangeHitType m_Mode: 1 @@ -24486,6 +24487,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1010647074} m_CullTransparentMesh: 1 +--- !u!225 &1010647080 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1010647074} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &1010659527 GameObject: m_ObjectHideFlags: 0 @@ -53571,10 +53584,11 @@ MonoBehaviour: isScorSettle: 0 playerScore: 0 enemyScore: 0 - straightHit: 0 + straightHit: 1 attackPattern: {fileID: 348419493} defenseIcon: {fileID: 21300000, guid: 8fd74ffa775b75741a21abd9250e2767, type: 3} attackIcon: {fileID: 21300000, guid: 0a1daf24126ecb54e87fbf1dbf3cec7b, type: 3} + attackHitTypeCanvasGroup: {fileID: 1010647080} scorResults: 0 playerScoreBar: {fileID: 905852578} playerScoreText: {fileID: 32712585} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/AttackScore/AttackScorManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/AttackScore/AttackScorManager.cs index a110f4e8..d2703dce 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/AttackScore/AttackScorManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/AttackScore/AttackScorManager.cs @@ -17,6 +17,7 @@ public class AttackScorManager : Singleton public Image attackPattern;//攻击模式指示 public Sprite defenseIcon; public Sprite attackIcon; + public CanvasGroup attackHitTypeCanvasGroup;//用来关闭开启射线阻挡 [Header("分数")] public int scorResults; public Image playerScoreBar; @@ -66,8 +67,9 @@ public class AttackScorManager : Singleton enemyScoreText .text = enemyScore .ToString(); //玩家血量 float maxHP = PlayerStatsManager.Instance.playerState.maxHP; - playerHPBar.fillAmount = (PlayerStatsManager.Instance.playerState.currentHP / maxHP); - float resultHP = PlayerStatsManager.Instance.playerState.currentHP; + float currentHP = PlayerStatsManager.Instance.playerState.currentHP; + playerHPBar.fillAmount = (currentHP / maxHP); + float resultHP = currentHP; if(straightHit ==false ) { if (scorResults < 0) @@ -80,10 +82,19 @@ public class AttackScorManager : Singleton resultHP -= enemyScore; } preViewHPBar.fillAmount = (resultHP / maxHP); - playerHPText.text = resultHP.ToString() + "/" + maxHP.ToString(); + if (resultHP != currentHP ) + { + playerHPText.text = currentHP.ToString() + "(" + (resultHP - currentHP).ToString() + ")/" + maxHP.ToString(); + } + else + { + playerHPText.text = currentHP.ToString() + "/" + maxHP.ToString(); + } + //敌人血量 - enemyHPBar.fillAmount = GameManager.Instance.enemy.currentEnemyHP / (float)GameManager.Instance.enemy.maxEnemyHP; - float resultEnemyHP = GameManager.Instance.enemy.currentEnemyHP; + int currentEnemyHP = GameManager.Instance.enemy.currentEnemyHP; + enemyHPBar.fillAmount =currentEnemyHP / (float)GameManager.Instance.enemy.maxEnemyHP; + float resultEnemyHP = currentEnemyHP; if (straightHit == false) { if (scorResults > 0) @@ -98,7 +109,14 @@ public class AttackScorManager : Singleton preEnemyHPBar.fillAmount = resultEnemyHP / 60.0f; if (resultEnemyHP>0) { - enemyHPText.text = resultEnemyHP.ToString() + "/" + GameManager.Instance.enemy.maxEnemyHP.ToString(); + if (resultEnemyHP != currentEnemyHP) + { + enemyHPText.text = currentEnemyHP.ToString() + "(" + (resultEnemyHP - currentEnemyHP).ToString() + ")/" + GameManager.Instance.enemy.maxEnemyHP.ToString(); + } + else + { + enemyHPText.text = currentEnemyHP.ToString() + "/" + GameManager.Instance.enemy.maxEnemyHP.ToString(); + } } else { @@ -161,10 +179,12 @@ public class AttackScorManager : Singleton { isScorSettle = true; enemyScoreBar.fillAmount = 1; + attackHitTypeCanvasGroup.blocksRaycasts = true; } public void FadeMode()//非战斗界面隐藏功能 { isScorSettle = false; + attackHitTypeCanvasGroup .blocksRaycasts = false; playerScoreBar.fillAmount = 0; playerScoreText.text = " "; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Enemy.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Enemy.cs index 21fb7862..5e41251a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Enemy.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Enemy.cs @@ -5,6 +5,7 @@ using System.Diagnostics; using System.Linq; using Unity.VisualScripting; using UnityEngine; +using UnityEngine.UI; using static TurnMaster; using Debug = UnityEngine.Debug; using Random = UnityEngine.Random; @@ -13,13 +14,17 @@ public class Enemy : MonoBehaviour { [Header ("怪物卡组")] public List deck = new List(); // 卡组 - public List hand = new List(); // 手牌 public List discardPile = new List();// 弃牌堆 - public List inPlay = new List(); // 战场上的牌 + // public List hand = new List(); // 手牌 + // public List inPlay = new List(); // 战场上的牌 + [Header("怪物卡组ui")] + public Transform cardFather; + public GameObject cardPrefab; + [Header("怪物血量")] public int currentEnemyHP=60; public int maxEnemyHP=60; - + public IEnumerator EnemyTurnSettle(int num) { @@ -37,8 +42,41 @@ public class Enemy : MonoBehaviour } //yield return null; + //刷新卡组ui + RefreshCardDeckUI(); //结束回合 TurnMaster.Instance.turn = Turn.enemyTurnEnd; + + } + public void RefreshCardDeckUI() + { + //删除所有子物体 + if (cardFather.childCount !=0) + { + int count = cardFather.childCount; + for (int i=0;i().sprite = deck[i].cardSprite; + } + } + for (int i = 0; i < discardPile.Count; i++) + { + GameObject disCard = Instantiate(cardPrefab, cardFather); + if (discardPile[i].isKnow == true) + { + disCard.GetComponent().sprite = discardPile[i].cardSprite; + } + disCard .transform .GetChild (0).gameObject.SetActive(true); + } } public void PlayCard(int num) { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyCard.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyCard.cs index dbe19a46..8ecd087e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyCard.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyCard.cs @@ -7,7 +7,8 @@ public class EnemyCard { public string[] nodesMark; public string[] nodesColor; - + public Sprite cardSprite; + public bool isKnow =false ;//是否打出过 public void CardSettle(MapUnity targetNode) { Debug.Log("打出一张"); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/PlayCard/EnemyPlayerCardUIManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/PlayCard/EnemyPlayerCardUIManager.cs index 5baf1bbd..41cfa65f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/PlayCard/EnemyPlayerCardUIManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/PlayCard/EnemyPlayerCardUIManager.cs @@ -9,7 +9,8 @@ public class EnemyPlayerCardUIManager : Singleton public void ShowCard(EnemyCard enemyCard) { - cardUIImage.sprite = CardManager.Instance.createGemImageByToolX(enemyCard.nodesMark, enemyCard.nodesColor); + cardUIImage.sprite = enemyCard.cardSprite; + enemyCard .isKnow = true; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/ShowEnemyDeck.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/ShowEnemyDeck.cs new file mode 100644 index 00000000..13b97abb --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/ShowEnemyDeck.cs @@ -0,0 +1,46 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; + +public class ShowEnemyDeck : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler +{ + public GameObject cardDeck; + public bool isLock; + public bool isOn; + private void Update() + { + if(isLock ==true ) + { + if (Input.GetKeyDown(KeyCode.Mouse0)|| Input.GetKeyDown(KeyCode.Mouse1)) + { + cardDeck.gameObject.SetActive(false); + isLock = false; + } + } + else + { + if (Input.GetKeyDown(KeyCode.Mouse1)) + { + if (isOn == true) + { + isLock = true; + } + } + } + } + public void OnPointerEnter(PointerEventData eventData) + { + cardDeck.SetActive(true); + isOn = true; + } + + public void OnPointerExit(PointerEventData eventData) + { + if (isLock == false) + { + cardDeck.SetActive(false); + } + isOn = false; + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/ShowEnemyDeck.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/ShowEnemyDeck.cs.meta new file mode 100644 index 00000000..126b05b5 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/ShowEnemyDeck.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 670f77706c43dbe4bacfe8ebd00441aa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs index 8a39f9f3..02093084 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs @@ -129,38 +129,62 @@ public class GameManager : Singleton { //生成角色数据 if (PlayerStatsManager.Instance.playerState != null) - playerState = PlayerStatsManager.Instance.playerState; + playerState = PlayerStatsManager.Instance.playerState; + //生成敌人数据 + StartCoroutine(CreatEnemyDate()); + //生成空地图列表 + // GenerateEnmptyMapList(); + GenerateEnmptyMapListDefault(); + //开局场地涂色并开始阶段 + StartCoroutine(StartStartColourCoroutine(complete)); + + } + [System.Serializable] + public class Yunit + { + public List Y; + } + IEnumerator CreatEnemyDate() + { + yield return new WaitUntil(() => complete == true); + yield return null; + //生成敌人卡牌 EnemyCard enemyCard = new EnemyCard(); enemyCard.nodesMark = new string[5] { "0_1", "0_-1", "-1_1", "-1_-1", "0_0" }; enemyCard.nodesColor = new string[5] { "black", "black", "black", "black", "black" }; + enemyCard.cardSprite = CardManager.Instance.createGemImageByToolX(enemyCard.nodesMark, enemyCard.nodesColor); EnemyCard enemyCard_2 = new EnemyCard(); enemyCard_2.nodesMark = new string[6] { "1_0", "0_1", "0_-1", "-1_0", "-1_1", "-1_-1" }; enemyCard_2.nodesColor = new string[6] { "black", "black", "black", "black", "black", "black" }; + enemyCard_2.cardSprite = CardManager.Instance.createGemImageByToolX(enemyCard_2.nodesMark, enemyCard_2.nodesColor); EnemyCard enemyCard_3 = new EnemyCard(); enemyCard_3.nodesMark = new string[5] { "0_0", "1_0", "2_0", "-1_0", "-2_0" }; enemyCard_3.nodesColor = new string[5] { "black", "black", "black", "black", "black" }; + enemyCard_3.cardSprite = CardManager.Instance.createGemImageByToolX(enemyCard_3.nodesMark, enemyCard_3.nodesColor); + + EnemyCard enemyCard_4 = new EnemyCard(); + enemyCard_4.nodesMark = new string[5] { "0_1", "0_-1", "-1_1", "-1_-1", "0_0" }; + enemyCard_4.nodesColor = new string[5] { "black", "black", "black", "black", "black" }; + enemyCard_4.cardSprite = CardManager.Instance.createGemImageByToolX(enemyCard_4.nodesMark, enemyCard_4.nodesColor); + EnemyCard enemyCard_5 = new EnemyCard(); + enemyCard_5.nodesMark = new string[6] { "1_0", "0_1", "0_-1", "-1_0", "-1_1", "-1_-1" }; + enemyCard_5.nodesColor = new string[6] { "black", "black", "black", "black", "black", "black" }; + enemyCard_5.cardSprite = CardManager.Instance.createGemImageByToolX(enemyCard_5.nodesMark, enemyCard_5.nodesColor); + EnemyCard enemyCard_6 = new EnemyCard(); + enemyCard_6.nodesMark = new string[5] { "0_0", "1_0", "2_0", "-1_0", "-2_0" }; + enemyCard_6.nodesColor = new string[5] { "black", "black", "black", "black", "black" }; + enemyCard_6.cardSprite = CardManager.Instance.createGemImageByToolX(enemyCard_6.nodesMark, enemyCard_6.nodesColor); enemy.deck.Add(enemyCard); - enemy.deck.Add(enemyCard); - enemy.deck.Add(enemyCard_2); enemy.deck.Add(enemyCard_2); enemy.deck.Add(enemyCard_3); - enemy.deck.Add(enemyCard_3); - //生成空地图列表 - // GenerateEnmptyMapList(); - GenerateEnmptyMapListDefault(); - //开局场地涂色并开始阶段 - StartCoroutine(StartStartColourCoroutine(complete)); - + enemy.deck.Add(enemyCard_4); + enemy.deck.Add(enemyCard_5); + enemy.deck.Add(enemyCard_6); + //生成敌人卡牌预览 + enemy.RefreshCardDeckUI(); } - - [System.Serializable] - public class Yunit - { - public List Y; - } - public void GenerateEnmptyMapList() { if (complete == false) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponManager.cs index 5c4f417d..eccfc41d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponManager.cs @@ -113,5 +113,18 @@ public class WeaponManager : Singleton isWeaponSettle = false; enemyWeaponObject.SetActive(false); enemyWeaponNodeList .gameObject .SetActive(false); + + foreach (Transform transform in playerWeaponNodeList) + { + WeaponNode weaponNode = transform.GetChild(0).GetComponent(); + if (weaponNode.enableVFX != null) + weaponNode.enableVFX.SetActive(false); + } + foreach (Transform transform in enemyWeaponNodeList) + { + WeaponNode weaponNode = transform.GetChild(0).GetComponent(); + if (weaponNode.enableVFX != null) + weaponNode.enableVFX.SetActive(false); + } } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs index 52e227f5..b1492f9f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Weapon/WeaponNode.cs @@ -589,6 +589,9 @@ public class WeaponNode : MonoBehaviour,IDragHandler, IBeginDragHandler, IEndDra { //临时加入背包 transform.SetParent(targetObj.transform); + //触发特效 + if (enableVFX != null) + enableVFX.SetActive(false); } else//其他位置归位 {