-
Notifications
You must be signed in to change notification settings - Fork 11
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.
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
Merge #156 avatar into dev #191
Open
Hyewon0309
wants to merge
25
commits into
Avatar_Into_Dev_0217
Choose a base branch
from
#156_Avatar
base: Avatar_Into_Dev_0217
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
클릭할 때마다 각도 리셋되는 현상 수정 완료
바뀐 상태에서 다른 표정으로 변경하도록 변경했습니다. 표정을 변경할 때마다 타이머를 리셋하는 기능도 추가했습니다.
[FIX] Avatar_faceCamera
Avatar_CameraView: Camera Rotation Speed [FIX]
1. PlayerInput class 추가 -> starterassetsinputs에 없는 모든 player 움직임 관련 input class 만들었음. 앞으로 여기에 추가해서 사용하는 방향으로 하면 player움직임 제한 등등 관리가 쉬울듯. 2. InputManager에서 lock 일괄 관리 mainroom에 prefab있음. 혹시 몰라서 inputfield 변할 때 lock 했던 기능 남겨둠. 3. maincanvases prefab, stickynote prefab, textchat prefab 수정 maincanvases: 우측하단 버튼, 우측 상단 버튼 쪽에 onclick으로 lock 함수 추가 stickynote: inputfield 변할 때 lock 추가 textchat: inputfield 변할 때 lock 추가, 더블클릭해서 채팅창 보일 때에는 event enter랑 exit으로 mouse만 제한하는 것 추가함 4. staterAssetsInputs 수정 5. CmaeraControl, Cammanager, avatarfacecontrol, emotion 수정 playerinput class 이용해서 입력 일괄 수정
0215_playerinput lock
- Change MoveSpeed/SprintSpeed - Change Jump Height, Jump Timeout, FallTimeout - Change SlopeLimit and SkinWidth - Chagne Emotion.cs
1. playerinput class 수정 앞으로 playerinput 추가 혹은 제어(lock)는 이 class 참고하면 좋을듯. 2. 1번 수정에 따른 InputManager, PlayerInputLock, StarterAssetsInputs, EmotionMenuScript, AvatarFaceControl, Emotion, CamManager, CameraControl 수정 3. T키 눌러서 face selection 떠 있는 동안 zoom 기능 제외한 모든 input lock -> EmoticonMenuScript의 OnEnable,OnDisable 4. Textchat에서 wheel만 제한 5. WorldMinimap 수정 미니맵 enter하면 mouse input 제한
0215_playerinputlock
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#156 에서 Avatar Sit 체크된 부분들 Merge (1인칭 카메라 제외 -> 버그 픽스 중)