From 148abc75e0e7d7bdee89a4aab49bee70f955f4a2 Mon Sep 17 00:00:00 2001
From: reynull <13519045@std.stei.itb.ac.id>
Date: Wed, 12 Apr 2023 16:58:36 +0700
Subject: [PATCH] add camera and pause to acces ShopUI
---
Assets/Scenes/Level_01.unity | 393 +++++++++++++++++++++-
Assets/Scenes/TestScene.unity | 4 +-
Assets/Scripts/Shop/Pet.json | 12 +-
Assets/Scripts/Shop/ShopController.cs | 17 +-
Assets/Scripts/Shop/ShopMenuController.cs | 44 ++-
Assets/customsave.cssav | Bin 400 -> 400 bytes
6 files changed, 446 insertions(+), 24 deletions(-)
diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index 186385e0..e86a4da5 100644
--- a/Assets/Scenes/Level_01.unity
+++ b/Assets/Scenes/Level_01.unity
@@ -408,6 +408,83 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2dd321af8b7d8e9429916d48c4128ae3, type: 3}
+--- !u!1001 &57317292
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 4346514758001380927}
+ m_Modifications:
+ - target: {fileID: 5358109398903638708, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_Name
+ value: Camera Pause
+ objectReference: {fileID: 0}
+ - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 2.69
+ objectReference: {fileID: 0}
+ - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1.8334885
+ objectReference: {fileID: 0}
+ - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -2.543152
+ objectReference: {fileID: 0}
+ - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.99939084
+ objectReference: {fileID: 0}
+ - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.034899496
+ objectReference: {fileID: 0}
+ - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 37.84
+ objectReference: {fileID: 0}
+ - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 6.498
+ objectReference: {fileID: 0}
+ - target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: -1.753
+ objectReference: {fileID: 0}
+ - target: {fileID: 5358109398903638711, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_Follow
+ value:
+ objectReference: {fileID: 543450653267068186}
+ - target: {fileID: 5358109398903638711, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_LookAt
+ value:
+ objectReference: {fileID: 543450653267068186}
+ - target: {fileID: 5358109398903638711, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_Priority
+ value: -2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5358109398903638711, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: m_StandbyUpdate
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6257698864391349085, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ propertyPath: XYAxis
+ value:
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
--- !u!1 &88478206
GameObject:
m_ObjectHideFlags: 0
@@ -517,6 +594,10 @@ PrefabInstance:
propertyPath: m_Name
value: Shop (1)
objectReference: {fileID: 0}
+ - target: {fileID: 4454354353102500851, guid: 5434ab35b1441ab43a1c3faf668da602, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4454354353102500860, guid: 5434ab35b1441ab43a1c3faf668da602, type: 3}
propertyPath: m_RootOrder
value: 18
@@ -709,11 +790,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
propertyPath: m_LocalPosition.y
- value: 1.8334885
+ value: 1.8334874
objectReference: {fileID: 0}
- target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
propertyPath: m_LocalPosition.z
- value: -2.543152
+ value: -2.5431516
objectReference: {fileID: 0}
- target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
propertyPath: m_LocalRotation.w
@@ -721,7 +802,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
propertyPath: m_LocalRotation.x
- value: 0.034899496
+ value: 0.0348993
objectReference: {fileID: 0}
- target: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
propertyPath: m_LocalRotation.y
@@ -830,8 +911,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 272130433}
- m_LocalRotation: {x: 0.034899496, y: 0, z: 0, w: 0.99939084}
- m_LocalPosition: {x: 2.69, y: 1.8334885, z: -2.543152}
+ m_LocalRotation: {x: 0.0348993, y: 0, z: 0, w: 0.99939084}
+ m_LocalPosition: {x: 2.69, y: 1.8334874, z: -2.5431516}
m_LocalScale: {x: 0.8575421, y: 0.8575421, z: 0.8575421}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1342,6 +1423,21 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 70b342d8ce5c2fd48b8fa3147d48d1d1, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &776185785 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 4454354353102500851, guid: 5434ab35b1441ab43a1c3faf668da602, type: 3}
+ m_PrefabInstance: {fileID: 133337047}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &807466938 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5358109398903638708, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ m_PrefabInstance: {fileID: 57317292}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &807466942 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 5358109398903638710, guid: 49efbb0a3dbfa441b9f7d13ae10d034c, type: 3}
+ m_PrefabInstance: {fileID: 57317292}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &837011783
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2222,7 +2318,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!114 &1696507784
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2729,11 +2825,91 @@ Transform:
m_CorrespondingSourceObject: {fileID: 3969839587655876119, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
m_PrefabInstance: {fileID: 3502970855580957453}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &655414897865540719
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7630081669475047185}
+ - component: {fileID: 4107574627763955735}
+ - component: {fileID: 6576595984123291254}
+ m_Layer: 0
+ m_Name: JADIER
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
--- !u!1 &919132149595004832 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4349462111621129389, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
m_PrefabInstance: {fileID: 3502970855580957453}
m_PrefabAsset: {fileID: 0}
+--- !u!108 &1832138048680397438
+Light:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4366916883456227113}
+ m_Enabled: 1
+ serializedVersion: 10
+ m_Type: 2
+ m_Shape: 0
+ m_Color: {r: 0.97179294, g: 1, b: 0.56981134, a: 1}
+ m_Intensity: 3
+ m_Range: 3
+ m_SpotAngle: 45
+ m_InnerSpotAngle: 21.80208
+ m_CookieSize: 10
+ m_Shadows:
+ m_Type: 1
+ m_Resolution: -1
+ m_CustomResolution: -1
+ m_Strength: 1
+ m_Bias: 0.05
+ m_NormalBias: 0.4
+ m_NearPlane: 0.2
+ m_CullingMatrixOverride:
+ e00: 1
+ e01: 0
+ e02: 0
+ e03: 0
+ e10: 0
+ e11: 1
+ e12: 0
+ e13: 0
+ e20: 0
+ e21: 0
+ e22: 1
+ e23: 0
+ e30: 0
+ e31: 0
+ e32: 0
+ e33: 1
+ m_UseCullingMatrixOverride: 0
+ m_Cookie: {fileID: 0}
+ m_DrawHalo: 0
+ m_Flare: {fileID: 0}
+ m_RenderMode: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingLayerMask: 1
+ m_Lightmapping: 4
+ m_LightShadowCasterMode: 0
+ m_AreaSize: {x: 1, y: 1}
+ m_BounceIntensity: 1
+ m_ColorTemperature: 6570
+ m_UseColorTemperature: 0
+ m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+ m_UseBoundingSphereOverride: 0
+ m_UseViewFrustumForShadowCasterCull: 1
+ m_ShadowRadius: 0
+ m_ShadowAngle: 0
--- !u!1001 &3502970855580957453
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2828,8 +3004,213 @@ PrefabInstance:
m_RemovedComponents:
- {fileID: 749261035, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
+--- !u!1 &3970552577822168197
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4346514758001380927}
+ - component: {fileID: 4346514758001380928}
+ - component: {fileID: 4346514758001380929}
+ - component: {fileID: 4346514758001380930}
+ m_Layer: 0
+ m_Name: Shop
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!33 &4107574627763955735
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 655414897865540719}
+ m_Mesh: {fileID: -2975405018647412305, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+--- !u!4 &4346514758001380927
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3970552577822168197}
+ 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: 807466942}
+ - {fileID: 7630081669475047185}
+ - {fileID: 4760764028842208874}
+ m_Father: {fileID: 0}
+ m_RootOrder: 19
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4346514758001380928
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3970552577822168197}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1633bb12434d68b46ab558d1b9043e51, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ pauseCameraObject: {fileID: 807466938}
+ ShopUI: {fileID: 776185785}
+--- !u!114 &4346514758001380929
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3970552577822168197}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 906933b6ec0f18d498e2f6d3a8547302, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!136 &4346514758001380930
+CapsuleCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3970552577822168197}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 1
+ m_Enabled: 1
+ m_Radius: 2
+ m_Height: 10
+ m_Direction: 1
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &4366916883456227113
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4760764028842208874}
+ - component: {fileID: 1832138048680397438}
+ m_Layer: 0
+ m_Name: Light
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4760764028842208874
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4366916883456227113}
+ m_LocalRotation: {x: 0.52327543, y: -0.34203392, z: 0.72694236, w: 0.28416622}
+ m_LocalPosition: {x: 0, y: 2.02, z: 0}
+ m_LocalScale: {x: 100.00001, y: 100, z: 100}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 4346514758001380927}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &5866666021469675360 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 7059278920872305773, guid: dbe370de796fd504dbbaa8a080d9fa0b, type: 3}
m_PrefabInstance: {fileID: 3502970855580957453}
m_PrefabAsset: {fileID: 0}
+--- !u!23 &6576595984123291254
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 655414897865540719}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 7266829850061502567, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 3542807760916392125, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 2348772296467874520, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 6345860596455543441, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -8774759145628691317, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -4903864921079101838, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 1301850626429766752, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 3566859711967257484, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -4632355282311829961, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 2275560893385797480, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 8069720770530618770, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 3445614234967466465, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -5680590720133373063, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -574890904429847544, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -7689857148262414204, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -3657780251709989146, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 276439964361699047, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 4110391199562710911, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 4628075913821805486, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -985545358020457150, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -77361960916257166, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -8442933466141192253, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 8843311948494937217, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -8902515529366372340, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -2095540062963856202, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -8498722979125644664, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 1778362602074029302, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: 4182029142102118020, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -6216866112798177072, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -1834216330569589730, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -63250634796460115, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ - {fileID: -3127463185751942412, guid: eb5453ff0e5141e48b998afacad7a6bd, type: 3}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
+--- !u!4 &7630081669475047185
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 655414897865540719}
+ m_LocalRotation: {x: 0.000000081460335, y: 0, z: -0, w: 1}
+ m_LocalPosition: {x: -0, y: 0, z: 0}
+ m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
+ m_ConstrainProportionsScale: 1
+ m_Children: []
+ m_Father: {fileID: 4346514758001380927}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity
index 2cf47427..76a7b5ba 100644
--- a/Assets/Scenes/TestScene.unity
+++ b/Assets/Scenes/TestScene.unity
@@ -314,7 +314,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4454354353102500851, guid: 5434ab35b1441ab43a1c3faf668da602, type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 4454354353102500860, guid: 5434ab35b1441ab43a1c3faf668da602, type: 3}
propertyPath: m_RootOrder
@@ -419,7 +419,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7430983448897361079, guid: 262412a9295e9444aa29986cde1c5a85, type: 3}
propertyPath: m_IsActive
- value: 1
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 262412a9295e9444aa29986cde1c5a85, type: 3}
diff --git a/Assets/Scripts/Shop/Pet.json b/Assets/Scripts/Shop/Pet.json
index 0822cf17..fb06d850 100644
--- a/Assets/Scripts/Shop/Pet.json
+++ b/Assets/Scripts/Shop/Pet.json
@@ -1,21 +1,21 @@
{
"item1": {
- "name": "",
- "type": "",
+ "name": "Kiana",
+ "type": "Attacker",
"desc": "",
"price": 0,
"prefab": ""
},
"item2": {
- "name": "",
- "type": "",
+ "name": "Yun",
+ "type": "Healer",
"desc": "",
"price": 0,
"prefab": ""
},
"item3": {
- "name": "",
- "type": "",
+ "name": "Tuna",
+ "type": "Supporter",
"desc": "",
"price": 0,
"prefab": ""
diff --git a/Assets/Scripts/Shop/ShopController.cs b/Assets/Scripts/Shop/ShopController.cs
index e63e4e60..313f6a62 100644
--- a/Assets/Scripts/Shop/ShopController.cs
+++ b/Assets/Scripts/Shop/ShopController.cs
@@ -1,15 +1,21 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+using Cinemachine;
public class ShopController : MonoBehaviour
{
- private bool isTrigerred = false;
+ private bool isTrigerred;
private pauseController pausecont;
+ private CinemachineVirtualCamera pauseCamera;
+ public GameObject pauseCameraObject;
+ public GameObject ShopUI;
// Start is called before the first frame update
void Start()
{
+ isTrigerred = false;
pausecont = GetComponent<pauseController>();
+ pauseCamera = pauseCameraObject.GetComponent<CinemachineVirtualCamera>();
}
// Update is called once per frame
@@ -18,11 +24,17 @@ public class ShopController : MonoBehaviour
if (isTrigerred && Input.GetKeyDown(KeyCode.F))
{
pausecont.Pause();
+ Cursor.lockState = CursorLockMode.None;
+ pauseCamera.Priority = 12;
+ ShopUI.SetActive(true);
}
- if (!isTrigerred && Input.GetKeyDown(KeyCode.Escape))
+ if (isTrigerred && Input.GetKeyDown(KeyCode.Escape))
{
pausecont.Resume();
+ Cursor.lockState = CursorLockMode.Locked;
+ pauseCamera.Priority = -2;
+ ShopUI.SetActive(false);
}
}
@@ -32,7 +44,6 @@ public class ShopController : MonoBehaviour
{
isTrigerred = !isTrigerred;
Debug.Log("Player in range for interract with Shop");
-
}
}
diff --git a/Assets/Scripts/Shop/ShopMenuController.cs b/Assets/Scripts/Shop/ShopMenuController.cs
index 062ca0db..bc88d7f7 100644
--- a/Assets/Scripts/Shop/ShopMenuController.cs
+++ b/Assets/Scripts/Shop/ShopMenuController.cs
@@ -57,7 +57,8 @@ public class ShopMenuController : MonoBehaviour
// GameObject[] weaponlist = player.GetComponent<PlayerController>().weaponList;
// Write
- string path = Application.dataPath+"/Scripts/Shop/Weapon.json";
+ string weaponpath = Application.dataPath+"/Scripts/Shop/Weapon.json";
+ string petpath = Application.dataPath+"/Scripts/Shop/Pet.json";
// weaponlist = new ShopItemList();
// ShopItemList test = new ShopItemList();
// string testS = JsonUtility.ToJson(test);
@@ -67,10 +68,39 @@ public class ShopMenuController : MonoBehaviour
// Debug.Log("Using class : "+testS);
// File.WriteAllText(path,serial);
- // read
- string data = File.ReadAllText(path);
- weaponlist = JsonUtility.FromJson<ShopItemList>(data);
- Debug.Log(weaponlist.item1.name);
+ // read weapon and pet
+ weaponlist = JsonUtility.FromJson<ShopItemList>(File.ReadAllText(weaponpath));
+ petlist = JsonUtility.FromJson<ShopItemList>(File.ReadAllText(petpath));
+
+ FillData(weaponItem,weaponlist);
+ FillData(petItem,petlist);
+ }
+
+ private void FillData(List<VisualElement> itemlist, ShopItemList itemSourceList)
+ {
+ ShopItem selectItem(int index, ShopItemList clist){
+ switch (index)
+ {
+ case 1:
+ return clist.item1;
+ case 2:
+ return clist.item2;
+ default:
+ return clist.item3;
+ }
+ }
+
+ int num = 1;
+ foreach (var item in itemlist)
+ {
+ ShopItem currentWeapon = selectItem(num,itemSourceList);
+ item.Q<Label>("Title").text = currentWeapon.name;
+ item.Q<Label>("Type").text = currentWeapon.type;
+ item.Q<Label>("ItemDesc").text = currentWeapon.desc;
+ item.Q<Label>("Price").text = currentWeapon.price.ToString();
+
+ num++;
+ }
}
private void UpgradeBtnClicked(ClickEvent evt, int num)
@@ -125,7 +155,7 @@ public class ShopMenuController : MonoBehaviour
this.type = type;
this.desc = desc;
this.price = price;
- this.desc = desc;
+ this.prefab = prefab;
}
public ShopItem()
@@ -134,7 +164,7 @@ public class ShopMenuController : MonoBehaviour
this.type = "";
this.desc = "";
this.price = 0;
- this.desc = "";
+ this.prefab = "";
}
}
diff --git a/Assets/customsave.cssav b/Assets/customsave.cssav
index 6ec196131016ef1ff835dc58eab23da89f3484e4..425f40f0560e5a97ce180f44a73d8ac038a59388 100644
GIT binary patch
literal 400
zcmV;B0dM{yRll(eqiIpL`qUSi1Wz|yk}3Hgu;C=YXHVH2qlIhH&dwJ<UXY#?)$ELP
z##KWvwNqrVVD>g0)auZDY)Xs(0b~`s0uDvo1Vj~=cbAQYa%#FCL-J=qx+@ktYS+A?
zHYlnMF!^8@q-ST3MqY!T=vo?@^NZEke`#-tMp+-rnA_lL;ewT2Gh2n@)d@cxS=rRw
zM{atK7(KNacq33whwOe&gP%%!%GtVDj^{R_@3|7C^*6>ee9UpDE$IW9{WL(8s&&@j
zH_X3?CVhp|+U!4eauvrj<WAmX>D0Ks97{a>Z2a7?J`XH-r9#FiWSekCb!A#zZv*=6
z3%S7{&8b{=yFf3F-lqSwDJlH&v}*~*n1kP55!}NI<G-}y$7ZUf**Wf#<L!K(ddnY*
zlp-Jk3D5?}=Da~eb}9vX;wt<n$LtPHpP9R&4?XqrkorW}`T}~1GE}PlR-W4KJx>fG
u$|eC^n;XogPwM70mq`I5MNs}WAKV%0wZLL{DYNiv2&nvl<v2ggJSCF(PRIrT
literal 400
zcmV;B0dM}BF)CQ*+?A(WzrYkKwCY4rshzP-c-hs7xUJcnK|v${x3s!<Y^L*s3pA@r
zILNP31-ct@<C?DcSh|@j($Tb7JVxK6C+)&NR%)?xj<P6x%c}RJ3emassezk6;}AQM
zu2vmW2<w2XR>b1?9W+^NFn396DRYv+|Cc>T-&uA7D-MoPXxf)c&=rQ_%5<RXQIk#e
z6P9sV=@nmq#~;c@UyZL^qby*MQEY6R{NRJ^z5j`Xxk|j#TZKf+tK}~Co>&2A&@~Bq
zux()UHb#v8LbDx~RK02yVudaP)JV?ka_~j&%BI$xGq9MgB23Th9!U50EaGNH0kf`{
z8QHv3`HG~#i7Gq3s2o)y`Q-RI)!i1bnaC)8su|>X&XsDrgP-lP4`6%sXpnbqPg&5(
z|D>#}MHCg1R%Di>lwnAX2^r<)1rcJP&;oi|zHWHFrK~S$135{|3~(W~Ut26kaQxVn
u2pCd^i--FcX;nA#Xf`%RDV<fhC01JzsDwS<Ffte|_ei8;F3DI5D*O|ss>jp-
--
GitLab