From 31efd2b18099cafb81f1923585de92b97b6f71a6 Mon Sep 17 00:00:00 2001 From: dassai0079 Date: Wed, 17 Jan 2024 03:27:08 +0900 Subject: [PATCH] fix/shop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 購入画面終了ボタンの追加 --- Assets/Scenes/testScene/test_dassai.unity | 488 +++++++++++++++++- Assets/scripts/dassai_test/Gene_Equipment.cs | 1 + Assets/scripts/dassai_test/GoodsSelecter.cs | 1 + Assets/scripts/dassai_test/Mane_DandD.cs | 1 + Assets/scripts/dassai_test/Mane_Purchase.cs | 3 +- .../scripts/dassai_test/Mane_PurchaseEquip.cs | 1 + .../scripts/dassai_test/Mane_PurchaseItem.cs | 23 +- .../scripts/dassai_test/Mane_PurchaseSkil.cs | 28 +- 8 files changed, 522 insertions(+), 24 deletions(-) diff --git a/Assets/Scenes/testScene/test_dassai.unity b/Assets/Scenes/testScene/test_dassai.unity index 0a1034e..1cacb0f 100644 --- a/Assets/Scenes/testScene/test_dassai.unity +++ b/Assets/Scenes/testScene/test_dassai.unity @@ -123,6 +123,11 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!224 &29845004 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + m_PrefabInstance: {fileID: 538756104} + m_PrefabAsset: {fileID: 0} --- !u!1 &33806025 GameObject: m_ObjectHideFlags: 0 @@ -178,7 +183,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ShowCost: {fileID: 1181227766} - itemNo: 5 + itemNo: 6 + background: {fileID: 806116508} --- !u!114 &33806028 MonoBehaviour: m_ObjectHideFlags: 0 @@ -308,7 +314,7 @@ RectTransform: - {fileID: 1611481983} - {fileID: 1979929014} m_Father: {fileID: 806116512} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -639,7 +645,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ShowCost: {fileID: 713713015} - itemNo: 4 + itemNo: 5 + background: {fileID: 806116508} --- !u!114 &336079796 MonoBehaviour: m_ObjectHideFlags: 0 @@ -914,8 +921,9 @@ RectTransform: - {fileID: 1722467896} - {fileID: 1947102288} - {fileID: 1340485874} + - {fileID: 29845004} m_Father: {fileID: 806116512} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1120,7 +1128,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ShowCost: {fileID: 1905837009} - itemNo: 3 + itemNo: 4 + background: {fileID: 806116508} --- !u!114 &470728313 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1295,6 +1304,135 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 502089904} m_CullTransparentMesh: 1 +--- !u!1001 &538756104 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 442914577} + m_Modifications: + - target: {fileID: 7669562563615385236, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_Name + value: Skilfin + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385242, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: skilNo + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385242, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: SkillPanel + value: + objectReference: {fileID: 442914576} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_SizeDelta.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 500 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -300 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7669562563615385243, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7669562563798981138, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_Text + value: End + objectReference: {fileID: 0} + - target: {fileID: 7669562563798981138, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7669562563798981138, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7669562563798981138, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7669562563798981138, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7669562564083620650, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} + propertyPath: m_Color.a + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5acce94fcb4177e43af99691d8b3a5bd, type: 3} --- !u!1 &610233129 GameObject: m_ObjectHideFlags: 0 @@ -1330,7 +1468,7 @@ RectTransform: - {fileID: 283337404} - {fileID: 502089905} m_Father: {fileID: 806116512} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1682,7 +1820,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &806116509 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1764,6 +1902,7 @@ RectTransform: - {fileID: 470728311} - {fileID: 336079794} - {fileID: 33806026} + - {fileID: 7654457667182752482} - {fileID: 1580695356} - {fileID: 1887344121} - {fileID: 61826754} @@ -1883,7 +2022,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &938893086 Transform: m_ObjectHideFlags: 0 @@ -2052,7 +2191,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ShowCost: {fileID: 273175527} - itemNo: 2 + itemNo: 3 + background: {fileID: 806116508} --- !u!114 &1081980642 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2367,7 +2507,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ShowCost: {fileID: 384910514} - itemNo: 1 + itemNo: 2 + background: {fileID: 806116508} --- !u!114 &1302670555 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3253,7 +3394,7 @@ RectTransform: - {fileID: 1428318720} - {fileID: 937263774} m_Father: {fileID: 806116512} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4165,6 +4306,10 @@ PrefabInstance: propertyPath: m_Name value: Beam objectReference: {fileID: 0} + - target: {fileID: 4362469884300235277, guid: 50c6861babfa159479b297f051d05706, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4362469884300235278, guid: 50c6861babfa159479b297f051d05706, type: 3} propertyPath: beamDuration value: 5 @@ -4222,6 +4367,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 806116512} m_Modifications: + - target: {fileID: 5233988280028328929, guid: 38c939c3c756cd94f9cd1545fbc3d8a5, type: 3} + propertyPath: itemNo + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5233988280028328929, guid: 38c939c3c756cd94f9cd1545fbc3d8a5, type: 3} + propertyPath: background + value: + objectReference: {fileID: 806116508} - target: {fileID: 5233988280028328932, guid: 38c939c3c756cd94f9cd1545fbc3d8a5, type: 3} propertyPath: m_Name value: Item0 @@ -4312,6 +4465,317 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 38c939c3c756cd94f9cd1545fbc3d8a5, type: 3} +--- !u!224 &7654457665801106628 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7654457665801106629} + 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: 7654457667182752482} + 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!1 &7654457665801106629 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7654457665801106628} + - component: {fileID: 7654457665801106634} + - component: {fileID: 7654457665801106635} + m_Layer: 5 + m_Name: Cost0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!222 &7654457665801106634 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7654457665801106629} + m_CullTransparentMesh: 1 +--- !u!114 &7654457665801106635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7654457665801106629} + 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: 0} + 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: 7 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &7654457666317496932 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7654457666317496935} + m_CullTransparentMesh: 1 +--- !u!114 &7654457666317496933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7654457666317496935} + 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: end +--- !u!224 &7654457666317496934 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7654457666317496935} + 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: 7654457667182752482} + 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!1 &7654457666317496935 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7654457666317496934} + - component: {fileID: 7654457666317496932} + - component: {fileID: 7654457666317496933} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &7654457667182752480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7654457667182752483} + 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!114 &7654457667182752481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7654457667182752483} + 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: 7654457667182752480} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7654457667182752486} + m_TargetAssemblyTypeName: Mane_Purchase, Assembly-CSharp + m_MethodName: OnClick + 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!224 &7654457667182752482 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7654457667182752483} + 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: 7654457666317496934} + - {fileID: 7654457665801106628} + m_Father: {fileID: 806116512} + m_RootOrder: 8 + 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: 100, y: -200} + m_SizeDelta: {x: 180, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7654457667182752483 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7654457667182752482} + - component: {fileID: 7654457667182752487} + - component: {fileID: 7654457667182752480} + - component: {fileID: 7654457667182752481} + - component: {fileID: 7654457667182752486} + m_Layer: 5 + m_Name: Itemfin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &7654457667182752486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7654457667182752483} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f50128b38db96e4a8f4af04ec0ca57d, type: 3} + m_Name: + m_EditorClassIdentifier: + ShowCost: {fileID: 7654457665801106629} + itemNo: 0 + background: {fileID: 806116508} +--- !u!222 &7654457667182752487 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7654457667182752483} + m_CullTransparentMesh: 1 --- !u!1001 &7669562564174880931 PrefabInstance: m_ObjectHideFlags: 0 @@ -4430,7 +4894,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9052149861958427434, guid: 919a3efee4c8ca34cad42fb62d0f1532, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 9052149861958427434, guid: 919a3efee4c8ca34cad42fb62d0f1532, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/scripts/dassai_test/Gene_Equipment.cs b/Assets/scripts/dassai_test/Gene_Equipment.cs index 59af374..49ddd29 100644 --- a/Assets/scripts/dassai_test/Gene_Equipment.cs +++ b/Assets/scripts/dassai_test/Gene_Equipment.cs @@ -3,6 +3,7 @@ using UnityEngine; using System; +//装備品によるステータス変化や装備ごとの上げ幅を管理する public class Gene_Equipment : MonoBehaviour { int atack=0; diff --git a/Assets/scripts/dassai_test/GoodsSelecter.cs b/Assets/scripts/dassai_test/GoodsSelecter.cs index e898a1c..bdb6a8b 100644 --- a/Assets/scripts/dassai_test/GoodsSelecter.cs +++ b/Assets/scripts/dassai_test/GoodsSelecter.cs @@ -4,6 +4,7 @@ public class GoodsSelecter : MonoBehaviour { + //ACeEwʂŕ\{^=i𒊑I public GameObject[] Item = new GameObject[30]; int selecter1; int selecter2; diff --git a/Assets/scripts/dassai_test/Mane_DandD.cs b/Assets/scripts/dassai_test/Mane_DandD.cs index ffd29e7..62a6ff1 100644 --- a/Assets/scripts/dassai_test/Mane_DandD.cs +++ b/Assets/scripts/dassai_test/Mane_DandD.cs @@ -4,6 +4,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; +//hbO&hbŐ@\낤Ƃ [RequireComponent(typeof(Image))] public class Mane_DandD : MonoBehaviour, IDragHandler, IBeginDragHandler, IDropHandler diff --git a/Assets/scripts/dassai_test/Mane_Purchase.cs b/Assets/scripts/dassai_test/Mane_Purchase.cs index 6cd4a0c..4502759 100644 --- a/Assets/scripts/dassai_test/Mane_Purchase.cs +++ b/Assets/scripts/dassai_test/Mane_Purchase.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using UnityEngine; +//XLwʂŕ\{^𒊑I public class Mane_Purchase : MonoBehaviour { public GameObject[] Item = new GameObject[30]; @@ -13,7 +14,7 @@ public class Mane_Purchase : MonoBehaviour void Start() { - for (int i = 0; i <= 12; i++) + for (int i = 0; i < 12; i++) { Item[i].SetActive(false); Debug.Log(i + "ANeBu"); diff --git a/Assets/scripts/dassai_test/Mane_PurchaseEquip.cs b/Assets/scripts/dassai_test/Mane_PurchaseEquip.cs index 2020c61..fc2da08 100644 --- a/Assets/scripts/dassai_test/Mane_PurchaseEquip.cs +++ b/Assets/scripts/dassai_test/Mane_PurchaseEquip.cs @@ -6,6 +6,7 @@ public class Mane_PurchaseEquip : MonoBehaviour { + //i̍wȆEz̑Ǘ //costłli,ShowCost͒lD̖,itemNo͊ǗpɃ{^ˆ‚Ɋ蓖Ă鐔 int cost; public GameObject ShowCost; diff --git a/Assets/scripts/dassai_test/Mane_PurchaseItem.cs b/Assets/scripts/dassai_test/Mane_PurchaseItem.cs index b2607f9..63a3c70 100644 --- a/Assets/scripts/dassai_test/Mane_PurchaseItem.cs +++ b/Assets/scripts/dassai_test/Mane_PurchaseItem.cs @@ -6,19 +6,25 @@ public class Mane_PurchaseItem : MonoBehaviour { + //ACewď𑝂₵Az𑝂₵肷 + //ƃACewʂ͋ʂłAōwʂ̕\E\(EV[Jڂ)Ǘ //costłli,ShowCost͒lD̖,itemNo͊ǗpɃ{^ˆ‚Ɋ蓖Ă鐔 int cost; public GameObject ShowCost; //ꂼ9‚ List itemAmount = new List() { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; [SerializeField] int itemNo; + public GameObject background; + bool isBackShown; void Start() { + isBackShown = true; + //case0I{^Ɋ蓖Ă switch (itemNo) { case 0: - cost = 10; + cost = 0; break; case 1: @@ -62,13 +68,22 @@ void Start() //{^NbNɃACeZƒli1.5{ public void OnClick() { - itemAmount[itemNo]++; - Debug.Log(itemNo + ""+cost+"ōwꂽ"); - cost = (int)Math.Round(1.5 * cost); + if (itemNo == 0) + { + isBackShown = false; + } + else + { + itemAmount[itemNo - 1]++; + Debug.Log(itemNo + "" + cost + "ōwꂽ"); + cost = (int)Math.Round(1.5 * cost); + } } void Update() { ShowCost.GetComponent().text = cost + "ōw"; + background.SetActive(isBackShown); + //isbackshown=falseȂV[JڂɈڂƂ...? } } diff --git a/Assets/scripts/dassai_test/Mane_PurchaseSkil.cs b/Assets/scripts/dassai_test/Mane_PurchaseSkil.cs index e7122ad..9d71f68 100644 --- a/Assets/scripts/dassai_test/Mane_PurchaseSkil.cs +++ b/Assets/scripts/dassai_test/Mane_PurchaseSkil.cs @@ -4,6 +4,8 @@ using UnityEngine.UI; using System; +//スキル購入によるお金の増減、スキル取得フラグの管理をする +//購入/終了ボタンを押すと次のアイテム/装備購入画面に移る public class Mane_PurchaseSkil : MonoBehaviour { //costでお値段,ShowCostは値札の役割,Skillpanelは購入の背景になるやつ @@ -15,6 +17,7 @@ public class Mane_PurchaseSkil : MonoBehaviour List haveSkil = new List() { false, false, false, false, false, false, false, false, false }; [SerializeField] int skilNo; + //case10を終了ボタンに割り当て void Start() { isSkillshown = true; @@ -35,22 +38,33 @@ void Start() case 3: cost = 7; break; + case 10: + cost = 0; + break; } } //ボタンクリック時にアイテム数加算と値段を大体1.5倍に public void OnClick() { - if (haveSkil[skilNo]) + if (skilNo == 10) { - Debug.Log("購入済です"); + Debug.Log("購入フェイズ終了"); + isSkillshown = false; } - else + if (skilNo != 10) { - Debug.Log(skilNo + "が" + cost + "で購入された"); - haveSkil[skilNo] = true; - cost = (int)Math.Round(1.5 * cost); - isSkillshown = false; + if (haveSkil[skilNo]) + { + Debug.Log("購入済です"); + } + else + { + Debug.Log(skilNo + "が" + cost + "で購入された"); + haveSkil[skilNo] = true; + cost = (int)Math.Round(1.5 * cost); + isSkillshown = false; + } } }