Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge #156 avatar into dev #191

Open
wants to merge 25 commits into
base: Avatar_Into_Dev_0217
Choose a base branch
from
Open

Merge #156 avatar into dev #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e610c3b
[FIX] change camera view to see sky
tnsqjahong Feb 14, 2022
a8080c5
[fix] Fixed Camera Rotation Speed
be9904 Feb 14, 2022
43f507d
[fix] Third Person Cam Rotate Speed Done
be9904 Feb 14, 2022
cb52548
[FIX] 1인칭일때 표정카메라
tnsqjahong Feb 14, 2022
77e27ce
[fix] Changed Zoom Key Binding to Scroll Up/Down
be9904 Feb 14, 2022
7780192
[fix] Show Face for 10 seconds Fixed
be9904 Feb 14, 2022
2964fe6
[FIX] 1인칭 face cam 수정
tnsqjahong Feb 14, 2022
6379281
[FIX] 1인칭 3인칭 전환 후 카메라 에러 수정
tnsqjahong Feb 14, 2022
e7019c0
[FIX] 1인칭 시점 에러 수정
tnsqjahong Feb 14, 2022
29c0cea
[FIX] 토글 띄울때 lerp
tnsqjahong Feb 15, 2022
acfd4d1
[fix] Set Local Player's FirstPersonCam Priority to 20
Hyewon0309 Feb 15, 2022
9bf799c
Merge pull request #165 from XREAL-SNU/Avatar_Soonbeom
Hyewon0309 Feb 15, 2022
7a16744
Merge pull request #162 from XREAL-SNU/Avatar_CameraView
Hyewon0309 Feb 15, 2022
ee16377
0215_playerinput lock
tehokim Feb 15, 2022
a4dd201
Merge branch '#156_Avatar' into Avatar_CameraView
Hyewon0309 Feb 15, 2022
f17d46e
Merge pull request #168 from XREAL-SNU/Avatar_CameraView
Hyewon0309 Feb 15, 2022
b921960
[fix] Avatar Prefab & Emotion
Hyewon0309 Feb 15, 2022
d4a402d
0215_playerinputlock
tehokim Feb 15, 2022
846f465
Merge pull request #171 from XREAL-SNU/Avatar_playerinput
Hyewon0309 Feb 15, 2022
6b0f19d
[fix] Null Reference Error in Lobby and MainRoom
be9904 Feb 15, 2022
9a9c034
[fix] Fix 10s Face Change to Coroutine & Removed AFM Singleton
be9904 Feb 15, 2022
9dace23
[feat] FP Cam Movement Added
be9904 Feb 15, 2022
d5e8234
[fix] Fixed Cam Null Ref Errors and Implemented FP Drag
be9904 Feb 16, 2022
cc40d8c
[fix] New Avatar fbx
Hyewon0309 Feb 16, 2022
8e4bca0
[fix] Temporarily Disabled FP Cam
be9904 Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Assets/Prefabs/ChatManager1 1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2147,6 +2147,7 @@ GameObject:
- component: {fileID: 7929645063852692301}
- component: {fileID: 7929645063852692291}
- component: {fileID: 7929645063852692300}
- component: {fileID: 1219082878299089262}
m_Layer: 0
m_Name: Contents Panel
m_TagString: Untagged
Expand Down Expand Up @@ -2214,6 +2215,18 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &1219082878299089262
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7929645063852692302}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a1ee60c3e8593d04aab97130d82e4e95, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7929645063891675609
GameObject:
m_ObjectHideFlags: 0
Expand Down
52 changes: 52 additions & 0 deletions Assets/Prefabs/InputManager.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1050175914571162229
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1050175914571162235}
- component: {fileID: 1050175914571162234}
m_Layer: 0
m_Name: InputManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1050175914571162235
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1050175914571162229}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1050175914571162234
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1050175914571162229}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e68ac5d1f69ed364da1e3a5a31e36981, type: 3}
m_Name:
m_EditorClassIdentifier:
_inputFields:
- {fileID: 0}
- {fileID: 0}
_TMPinputFields:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
7 changes: 7 additions & 0 deletions Assets/Prefabs/InputManager.prefab.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

118 changes: 108 additions & 10 deletions Assets/Prefabs/UI/MainRoom/MainCanvases.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13346,6 +13346,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1050175914571162234, guid: 2c1f082c99ea64f4496a7e8c07b875bc, type: 3}
m_TargetAssemblyTypeName: InputManager, Assembly-CSharp
m_MethodName: Lock
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!1 &2794768153847073048
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -14279,6 +14291,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1050175914571162234, guid: 2c1f082c99ea64f4496a7e8c07b875bc, type: 3}
m_TargetAssemblyTypeName: InputManager, Assembly-CSharp
m_MethodName: Lock
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!1 &2794768154405091511
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -15020,6 +15044,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1050175914571162234, guid: 2c1f082c99ea64f4496a7e8c07b875bc, type: 3}
m_TargetAssemblyTypeName: InputManager, Assembly-CSharp
m_MethodName: Lock
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!1 &2794768154881405107
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -20619,6 +20655,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1050175914571162234, guid: 2c1f082c99ea64f4496a7e8c07b875bc, type: 3}
m_TargetAssemblyTypeName: InputManager, Assembly-CSharp
m_MethodName: UnLock
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!1 &3977133470497631112
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -21964,6 +22012,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1050175914571162234, guid: 2c1f082c99ea64f4496a7e8c07b875bc, type: 3}
m_TargetAssemblyTypeName: InputManager, Assembly-CSharp
m_MethodName: ButtonLock
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 &4638741033727324120
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -23442,7 +23502,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -25099,7 +25159,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!223 &2099059066778511129
Expand Down Expand Up @@ -25223,7 +25283,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!223 &8331254581485824553
Expand Down Expand Up @@ -30260,7 +30320,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -33124,7 +33184,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -38350,7 +38410,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 7195381633223351885}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 1050175914571162234, guid: 2c1f082c99ea64f4496a7e8c07b875bc, type: 3}
m_TargetAssemblyTypeName: InputManager, Assembly-CSharp
m_MethodName: UnLock
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!1 &7417045227217543157
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -39982,6 +40054,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1050175914571162234, guid: 2c1f082c99ea64f4496a7e8c07b875bc, type: 3}
m_TargetAssemblyTypeName: InputManager, Assembly-CSharp
m_MethodName: UnLock
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!1 &7639550891007949034
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -40447,6 +40531,7 @@ GameObject:
- component: {fileID: 4698506952267955990}
- component: {fileID: 6055520478735891461}
- component: {fileID: 6586616811092558755}
- component: {fileID: 7163646104930230966}
m_Layer: 5
m_Name: Alarm Button
m_TagString: Untagged
Expand Down Expand Up @@ -40556,9 +40641,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: AlarmListPanel, Assembly-CSharp
m_MethodName: OnClcikShow
- m_Target: {fileID: 1050175914571162234, guid: 2c1f082c99ea64f4496a7e8c07b875bc, type: 3}
m_TargetAssemblyTypeName: InputManager, Assembly-CSharp
m_MethodName: ButtonLock
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
Expand All @@ -40568,6 +40653,19 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &7163646104930230966
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7690052827672349478}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 85fbfb5c7371718418a357dd61e67790, type: 3}
m_Name:
m_EditorClassIdentifier:
Panel: {fileID: 0}
--- !u!1 &7693549279417525265
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -45998,7 +46096,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
Expand Down
Loading