Degulleo/Degulleo3D
7
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

Compare commits

base: Degulleo:280a591f3e3afe4cd468e0bc0329a33c0c8a3a70
Branches Tags
Degulleo:main
Degulleo:DEG-178-돌발이벤트패널-재작
Degulleo:DEG-165-세이브-강화-버그수정
Degulleo:DEG-172-일상UI-색상변경-던전UI-눌림표시
Degulleo:DEG-27-돌발이벤트-시스템
..
compare: Degulleo:469523ac9511e12e0bd4fc7723c35d6ba2c836b7
Branches Tags
Degulleo:main
Degulleo:DEG-178-돌발이벤트패널-재작
Degulleo:DEG-165-세이브-강화-버그수정
Degulleo:DEG-172-일상UI-색상변경-던전UI-눌림표시
Degulleo:DEG-27-돌발이벤트-시스템

No commits in common. "280a591f3e3afe4cd468e0bc0329a33c0c8a3a70" and "469523ac9511e12e0bd4fc7723c35d6ba2c836b7" have entirely different histories.
280a591f3e ... 469523ac95

787 changed files with 140147 additions and 112 deletions
Show Stats Expand all files Collapse all files

2
Assets/Animation.meta → Assets/JAY.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 319ea561ecf14f24a8c397dcf3384433
guid: a0ba1963fb7ce5041be57eb9074619f8
folderAsset: yes
DefaultImporter:
externalObjects: {}

0
Assets/Animation/Player.meta → Assets/JAY/Animation.meta
View File

0
Assets/Animation/Player/Attack_idle.anim → Assets/JAY/Animation/Attack_idle.anim
View File

0
Assets/Animation/Player/Attack_idle.anim.meta → Assets/JAY/Animation/Attack_idle.anim.meta
View File

0
Assets/Animation/Player/CustomAttack01.anim → Assets/JAY/Animation/CustomAttack01.anim
View File

0
Assets/Animation/Player/CustomAttack01.anim.meta → Assets/JAY/Animation/CustomAttack01.anim.meta
View File

0
Assets/Animation/Player/CustomAttack02.anim → Assets/JAY/Animation/CustomAttack02.anim
View File

0
Assets/Animation/Player/CustomAttack02.anim.meta → Assets/JAY/Animation/CustomAttack02.anim.meta
View File

0
Assets/Animation/Player/Damage.anim → Assets/JAY/Animation/Damage.anim
View File

0
Assets/Animation/Player/Damage.anim.meta → Assets/JAY/Animation/Damage.anim.meta
View File

0
Assets/Animation/Player/Dying.anim → Assets/JAY/Animation/Dying.anim
View File

0
Assets/Animation/Player/Dying.anim.meta → Assets/JAY/Animation/Dying.anim.meta
View File

0
Assets/Animation/Player/Run.anim → Assets/JAY/Animation/Run.anim
View File

0
Assets/Animation/Player/Run.anim.meta → Assets/JAY/Animation/Run.anim.meta
View File

0
Assets/Animation/Player/UpperBody.mask → Assets/JAY/Animation/UpperBody.mask
View File

0
Assets/Animation/Player/UpperBody.mask.meta → Assets/JAY/Animation/UpperBody.mask.meta
View File

0
Assets/Animation/Player/Victory.anim → Assets/JAY/Animation/Victory.anim
View File

0
Assets/Animation/Player/Victory.anim.meta → Assets/JAY/Animation/Victory.anim.meta
View File

2
Assets/Animation/Animation Controller.meta → Assets/JAY/Animator.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 22739671240a4e8489ad2f1f4395a48b
guid: a9e0606fbb9eff542926cf31a71db1ec
folderAsset: yes
DefaultImporter:
externalObjects: {}

0
Assets/Animation/Animation Controller/BattlePlayerController.controller → Assets/JAY/Animator/BattlePlayerController.controller
View File

0
Assets/Animation/Animation Controller/BattlePlayerController.controller.meta → Assets/JAY/Animator/BattlePlayerController.controller.meta
View File

0
Assets/Animation/Animation Controller/NormalPlayerСontroller.controller → Assets/JAY/Animator/NormalPlayerСontroller.controller
View File

0
Assets/Animation/Animation Controller/NormalPlayerСontroller.controller.meta → Assets/JAY/Animator/NormalPlayerСontroller.controller.meta
View File

BIN
Assets/JAY/Character Test Scene.unity (Stored with Git LFS) Normal file
View File

Binary file not shown.

7
Assets/JAY/Character Test Scene.unity.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 96b35fd950759c34895ff811b76af3c3
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Prefabs/Player Prefabs/Image.meta → Assets/JAY/Image.meta
View File

0
Assets/Prefabs/Player Prefabs/Image/red_splatter.png → Assets/JAY/Image/red_splatter.png
View File

0
Assets/Prefabs/Player Prefabs/Image/red_splatter.png.meta → Assets/JAY/Image/red_splatter.png.meta
View File

0
Assets/Prefabs/Player Prefabs.meta → Assets/JAY/Prefabs.meta
View File

0
Assets/Prefabs/Player Prefabs/BattlePlayer.prefab → Assets/JAY/Prefabs/BattlePlayer.prefab
View File

0
Assets/Prefabs/Player Prefabs/BattlePlayer.prefab.meta → Assets/JAY/Prefabs/BattlePlayer.prefab.meta
View File

0
Assets/Prefabs/Player Prefabs/NormalPlayer.prefab → Assets/JAY/Prefabs/NormalPlayer.prefab
View File

0
Assets/Prefabs/Player Prefabs/NormalPlayer.prefab.meta → Assets/JAY/Prefabs/NormalPlayer.prefab.meta
View File

0
Assets/Prefabs/Player Prefabs/Player.prefab → Assets/JAY/Prefabs/Player.prefab
View File

0
Assets/Prefabs/Player Prefabs/Player.prefab.meta → Assets/JAY/Prefabs/Player.prefab.meta
View File

0
Assets/Prefabs/Player Prefabs/ef_6.prefab → Assets/JAY/Prefabs/ef_6.prefab
View File

0
Assets/Prefabs/Player Prefabs/ef_6.prefab.meta → Assets/JAY/Prefabs/ef_6.prefab.meta
View File

0
Assets/Prefabs/Player Prefabs/ef_9_root.prefab → Assets/JAY/Prefabs/ef_9_root.prefab
View File

0
Assets/Prefabs/Player Prefabs/ef_9_root.prefab.meta → Assets/JAY/Prefabs/ef_9_root.prefab.meta
View File

2
Assets/Prefabs/Scene.meta → Assets/JAY/Scripts.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 89e0773700b5aa84ca02bd5e9974c2fa
guid: 815e81ef8b9bcab49bf3ab57cd0a44ff
folderAsset: yes
DefaultImporter:
externalObjects: {}

0
Assets/Scripts/Character/Player/AnimatorEventRelay.cs → Assets/JAY/Scripts/AnimatorEventRelay.cs
View File

0
Assets/Scripts/Character/Player/AnimatorEventRelay.cs.meta → Assets/JAY/Scripts/AnimatorEventRelay.cs.meta
View File

0
Assets/Scripts/Character/Player/Effect.meta → Assets/JAY/Scripts/Effect.meta
View File

0
Assets/Scripts/Character/Player/Effect/CameraShake.cs → Assets/JAY/Scripts/Effect/CameraShake.cs
View File

0
Assets/Scripts/Character/Player/Effect/CameraShake.cs.meta → Assets/JAY/Scripts/Effect/CameraShake.cs.meta
View File

0
Assets/Scripts/Character/Player/Effect/EffectManager.cs → Assets/JAY/Scripts/Effect/EffectManager.cs
View File

0
Assets/Scripts/Character/Player/Effect/EffectManager.cs.meta → Assets/JAY/Scripts/Effect/EffectManager.cs.meta
View File

0
Assets/Scripts/Character/Player/Effect/PlayerHitEffectController.cs → Assets/JAY/Scripts/Effect/PlayerHitEffectController.cs
View File

0
Assets/Scripts/Character/Player/Effect/PlayerHitEffectController.cs.meta → Assets/JAY/Scripts/Effect/PlayerHitEffectController.cs.meta
View File

0
Assets/Scripts/Character/Player/PlayerAction.meta → Assets/JAY/Scripts/PlayerAction.meta
View File

0
Assets/Scripts/Character/Player/PlayerAction/IPlayerAction.cs → Assets/JAY/Scripts/PlayerAction/IPlayerAction.cs
View File

0
Assets/Scripts/Character/Player/PlayerAction/IPlayerAction.cs.meta → Assets/JAY/Scripts/PlayerAction/IPlayerAction.cs.meta
View File

0
Assets/Scripts/Character/Player/PlayerAction/PlayerActionAttack.cs → Assets/JAY/Scripts/PlayerAction/PlayerActionAttack.cs
View File

0
Assets/Scripts/Character/Player/PlayerAction/PlayerActionAttack.cs.meta → Assets/JAY/Scripts/PlayerAction/PlayerActionAttack.cs.meta
View File

0
Assets/Scripts/Character/Player/PlayerAction/PlayerActionDash.cs → Assets/JAY/Scripts/PlayerAction/PlayerActionDash.cs
View File

0
Assets/Scripts/Character/Player/PlayerAction/PlayerActionDash.cs.meta → Assets/JAY/Scripts/PlayerAction/PlayerActionDash.cs.meta
View File

0
Assets/Scripts/Character/Player/PlayerController.cs → Assets/JAY/Scripts/PlayerController.cs
View File

0
Assets/Scripts/Character/Player/PlayerController.cs.meta → Assets/JAY/Scripts/PlayerController.cs.meta
View File

0
Assets/Scripts/Character/Player/PlayerControllerEditor.cs → Assets/JAY/Scripts/PlayerControllerEditor.cs
View File

0
Assets/Scripts/Character/Player/PlayerControllerEditor.cs.meta → Assets/JAY/Scripts/PlayerControllerEditor.cs.meta
View File

0
Assets/Scripts/Character/Player/PlayerState.meta → Assets/JAY/Scripts/PlayerState.meta
View File

0
Assets/Scripts/Character/Player/PlayerState/IPlayerState.cs → Assets/JAY/Scripts/PlayerState/IPlayerState.cs
View File

0
Assets/Scripts/Character/Player/PlayerState/IPlayerState.cs.meta → Assets/JAY/Scripts/PlayerState/IPlayerState.cs.meta
View File

0
Assets/Scripts/Character/Player/PlayerState/PlayerStateDead.cs → Assets/JAY/Scripts/PlayerState/PlayerStateDead.cs
View File

0
Assets/Scripts/Character/Player/PlayerState/PlayerStateDead.cs.meta → Assets/JAY/Scripts/PlayerState/PlayerStateDead.cs.meta
View File

0
Assets/Scripts/Character/Player/PlayerState/PlayerStateHit.cs → Assets/JAY/Scripts/PlayerState/PlayerStateHit.cs
View File

0
Assets/Scripts/Character/Player/PlayerState/PlayerStateHit.cs.meta → Assets/JAY/Scripts/PlayerState/PlayerStateHit.cs.meta
View File

0
Assets/Scripts/Character/Player/PlayerState/PlayerStateIdle.cs → Assets/JAY/Scripts/PlayerState/PlayerStateIdle.cs
View File

0
Assets/Scripts/Character/Player/PlayerState/PlayerStateIdle.cs.meta → Assets/JAY/Scripts/PlayerState/PlayerStateIdle.cs.meta
View File

0
Assets/Scripts/Character/Player/PlayerState/PlayerStateMove.cs → Assets/JAY/Scripts/PlayerState/PlayerStateMove.cs
View File

0
Assets/Scripts/Character/Player/PlayerState/PlayerStateMove.cs.meta → Assets/JAY/Scripts/PlayerState/PlayerStateMove.cs.meta
View File

0
Assets/Scripts/Character/Player/PlayerState/PlayerStateWin.cs → Assets/JAY/Scripts/PlayerState/PlayerStateWin.cs
View File

0
Assets/Scripts/Character/Player/PlayerState/PlayerStateWin.cs.meta → Assets/JAY/Scripts/PlayerState/PlayerStateWin.cs.meta
View File

0
Assets/Scripts/Character/Player/Weapon.meta → Assets/JAY/Scripts/Weapon.meta
View File

0
Assets/Scripts/Character/Player/Weapon/IObservable.cs → Assets/JAY/Scripts/Weapon/IObservable.cs
View File

0
Assets/Scripts/Character/Player/Weapon/IObservable.cs.meta → Assets/JAY/Scripts/Weapon/IObservable.cs.meta
View File

0
Assets/Scripts/Character/Player/Weapon/IObserver.cs → Assets/JAY/Scripts/Weapon/IObserver.cs
View File

0
Assets/Scripts/Character/Player/Weapon/IObserver.cs.meta → Assets/JAY/Scripts/Weapon/IObserver.cs.meta
View File

0
Assets/Scripts/Character/Player/WeaponController.cs → Assets/JAY/Scripts/WeaponController.cs
View File

0
Assets/Scripts/Character/Player/WeaponController.cs.meta → Assets/JAY/Scripts/WeaponController.cs.meta
View File

8
Assets/JYY.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1b5aeb9ba846be447b6d45e182831f68
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Animation/Enemy.meta → Assets/JYY/Animation.meta
View File

0
Assets/Animation/Enemy/Attack01 Slash.anim → Assets/JYY/Animation/Attack01 Slash.anim
View File

0
Assets/Animation/Enemy/Attack01 Slash.anim.meta → Assets/JYY/Animation/Attack01 Slash.anim.meta
View File

0
Assets/Animation/Enemy/Attack01.anim → Assets/JYY/Animation/Attack01.anim
View File

0
Assets/Animation/Enemy/Attack01.anim.meta → Assets/JYY/Animation/Attack01.anim.meta
View File

0
Assets/Animation/Enemy/Attack02.anim → Assets/JYY/Animation/Attack02.anim
View File

0
Assets/Animation/Enemy/Attack02.anim.meta → Assets/JYY/Animation/Attack02.anim.meta
View File

0
Assets/Animation/Enemy/Defend.anim → Assets/JYY/Animation/Defend.anim
View File

0
Assets/Animation/Enemy/Defend.anim.meta → Assets/JYY/Animation/Defend.anim.meta
View File

0
Assets/Animation/Enemy/Die.anim → Assets/JYY/Animation/Die.anim
View File

0
Assets/Animation/Enemy/Die.anim.meta → Assets/JYY/Animation/Die.anim.meta
View File

0
Assets/Animation/Enemy/DieRecover.anim → Assets/JYY/Animation/DieRecover.anim
View File

0
Assets/Animation/Enemy/DieRecover.anim.meta → Assets/JYY/Animation/DieRecover.anim.meta
View File

0
Assets/Animation/Enemy/Dizzy.anim → Assets/JYY/Animation/Dizzy.anim
View File

0
Assets/Animation/Enemy/Dizzy.anim.meta → Assets/JYY/Animation/Dizzy.anim.meta
View File

0
Assets/Animation/Enemy/GetHit.anim → Assets/JYY/Animation/GetHit.anim
View File

0
Assets/Animation/Enemy/GetHit.anim.meta → Assets/JYY/Animation/GetHit.anim.meta
View File

0
Assets/Animation/Enemy/Idle_Battle.anim → Assets/JYY/Animation/Idle_Battle.anim
View File

0
Assets/Animation/Enemy/Idle_Battle.anim.meta → Assets/JYY/Animation/Idle_Battle.anim.meta
View File

Some files were not shown because too many files have changed in this diff Show More