Skip to content
Snippets Groups Projects

fix: camera, skill

Merged fix: camera, skill
hotfix/mouse-camera into dev
Merged Muhamad Aji Wibisono requested to merge hotfix/mouse-camera into dev
Compare
and
6 files
+ 185
− 182
Preferences
Compare changes
Files
6
Assets/_Scenes/DevRoom.unity
+ 172
− 172
@@ -550,6 +550,102 @@ MonoBehaviour:
- EdgeIndices: 14000000150000001600000017000000
TexGenIndex: 5
Generation: 33
--- !u!1 &139727911
GameObject:
m_ObjectHideFlags: 17
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 139727914}
- component: {fileID: 139727913}
- component: {fileID: 139727912}
m_Layer: 0
m_Name: '[default-CSGModel]'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 124
m_IsActive: 1
--- !u!54 &139727912
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 139727911}
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 126
m_CollisionDetection: 0
--- !u!114 &139727913
MonoBehaviour:
m_ObjectHideFlags: 17
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 139727911}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8672dcc90e16b0a489a41edf56e016f8, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabBehaviour: 0
PrefabSourceAlignment: 4
PrefabDestinationAlignment: 0
Version: 1.1
infiniteBrush: {fileID: 0}
Settings: 1025
VertexChannels: 14
ReceiveGI: 2
MeshColliderCookingOptions: 14
ShowGeneratedMeshes: 0
DefaultPhysicsMaterial: {fileID: 13400000, guid: 0c5fdfb44d6f19646a41a0720fbf751a, type: 2}
exportType: 0
originType: 0
exportColliders: 0
exportPath:
angleError: 1
areaError: 1
hardAngle: 60
packMargin: 20
scaleInLightmap: 1
autoUVMaxDistance: 0.5
autoUVMaxAngle: 89
minimumChartSize: 4
--- !u!4 &139727914
Transform:
m_ObjectHideFlags: 17
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 139727911}
serializedVersion: 2
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: 589684407}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &160202240
GameObject:
m_ObjectHideFlags: 0
@@ -1498,53 +1594,6 @@ MonoBehaviour:
- EdgeIndices: 14000000150000001600000017000000
TexGenIndex: 5
Generation: 33
--- !u!1 &222371573
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 222371574}
- component: {fileID: 222371575}
m_Layer: 0
m_Name: '[generated-meshes]'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &222371574
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 222371573}
serializedVersion: 2
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: 1608329738}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &222371575
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 222371573}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5c3643d4978096d4880d7edbf4f65a50, type: 3}
m_Name:
m_EditorClassIdentifier:
Version: 1
owner: {fileID: 1608329737}
helperSurfaces: []
--- !u!1 &224671921
GameObject:
m_ObjectHideFlags: 0
@@ -1806,6 +1855,35 @@ MonoBehaviour:
- EdgeIndices: 14000000150000001600000017000000
TexGenIndex: 5
Generation: 33
--- !u!21 &267756818
Material:
serializedVersion: 8
m_ObjectHideFlags: 32
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Color_RGBA(1.000, 0.000, 1.000, 1.000)
m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_Ints: []
m_Floats: []
m_Colors:
- _Color: {r: 1, g: 0, b: 1, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!1 &296110128
GameObject:
m_ObjectHideFlags: 0
@@ -5065,35 +5143,53 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c54dc993f0d1e36499ea37e182a87cbc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!21 &600660464
Material:
serializedVersion: 8
m_ObjectHideFlags: 32
--- !u!1 &589684406
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Color_RGBA(1.000, 0.000, 1.000, 1.000)
m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_Ints: []
m_Floats: []
m_Colors:
- _Color: {r: 1, g: 0, b: 1, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
serializedVersion: 6
m_Component:
- component: {fileID: 589684407}
- component: {fileID: 589684408}
m_Layer: 0
m_Name: '[generated-meshes]'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &589684407
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 589684406}
serializedVersion: 2
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: 139727914}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &589684408
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 589684406}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5c3643d4978096d4880d7edbf4f65a50, type: 3}
m_Name:
m_EditorClassIdentifier:
Version: 1
owner: {fileID: 139727913}
helperSurfaces: []
--- !u!1 &601827281
GameObject:
m_ObjectHideFlags: 0
@@ -7371,7 +7467,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8467439526490713948, guid: 8be5a49d9c8c64b4d8a5af2b2255a3e3, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@@ -11662,102 +11758,6 @@ MonoBehaviour:
- EdgeIndices: 14000000150000001600000017000000
TexGenIndex: 5
Generation: 33
--- !u!1 &1608329735
GameObject:
m_ObjectHideFlags: 17
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1608329738}
- component: {fileID: 1608329737}
- component: {fileID: 1608329736}
m_Layer: 0
m_Name: '[default-CSGModel]'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 124
m_IsActive: 1
--- !u!54 &1608329736
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1608329735}
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 126
m_CollisionDetection: 0
--- !u!114 &1608329737
MonoBehaviour:
m_ObjectHideFlags: 17
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1608329735}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8672dcc90e16b0a489a41edf56e016f8, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabBehaviour: 0
PrefabSourceAlignment: 4
PrefabDestinationAlignment: 0
Version: 1.1
infiniteBrush: {fileID: 0}
Settings: 1025
VertexChannels: 14
ReceiveGI: 2
MeshColliderCookingOptions: 14
ShowGeneratedMeshes: 0
DefaultPhysicsMaterial: {fileID: 13400000, guid: 0c5fdfb44d6f19646a41a0720fbf751a, type: 2}
exportType: 0
originType: 0
exportColliders: 0
exportPath:
angleError: 1
areaError: 1
hardAngle: 60
packMargin: 20
scaleInLightmap: 1
autoUVMaxDistance: 0.5
autoUVMaxAngle: 89
minimumChartSize: 4
--- !u!4 &1608329738
Transform:
m_ObjectHideFlags: 17
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1608329735}
serializedVersion: 2
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: 222371574}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1611952787
GameObject:
m_ObjectHideFlags: 0
@@ -13271,7 +13271,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 600660464}
- {fileID: 267756818}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -31514,4 +31514,4 @@ SceneRoots:
- {fileID: 1491415303457514700}
- {fileID: 4313360953454956523}
- {fileID: 1036636693}
- {fileID: 1608329738}
- {fileID: 139727914}