浏览代码
Merge branch 'develop' into feature/pathfinding
Merge branch 'develop' into feature/pathfinding
# Conflicts: # Assets/BossRoom/Scenes/DungeonTest.unity # Assets/BossRoom/Scripts/Client/ClientInputSender.cs # Assets/BossRoom/Scripts/Server/Game/Action/ChaseAction.cs # Assets/BossRoom/Scripts/Server/ServerCharacterMovement.cs # ProjectSettings/DynamicsManager.asset # ProjectSettings/NavMeshAreas.asset # ProjectSettings/TagManager.asset/main
Luke Stampfli
4 年前
当前提交
aaf62377
共有 73 个文件被更改,包括 5450 次插入 和 1116 次删除
-
116Assets/BossRoom/Models/CharacterSet.fbx.meta
-
478Assets/BossRoom/Prefabs/Character/CharacterSet.prefab
-
89Assets/BossRoom/Prefabs/Character/Boss_deprecated.prefab
-
103Assets/BossRoom/Prefabs/Enemy.prefab
-
18Assets/BossRoom/Prefabs/Imp.prefab
-
23Assets/BossRoom/Prefabs/NetworkingManager.prefab
-
4Assets/BossRoom/Prefabs/State/BossRoomState.prefab
-
869Assets/BossRoom/Scenes/DungeonTest.unity
-
49Assets/BossRoom/Scenes/MainMenu.unity
-
32Assets/BossRoom/Scripts/Client/ClientCharacterVisualization.cs
-
11Assets/BossRoom/Scripts/Client/ClientInputSender.cs
-
2Assets/BossRoom/Scripts/Client/Game/Character/ModelSwap.cs
-
10Assets/BossRoom/Scripts/Client/Net/ClientGameNetPortal.cs
-
8Assets/BossRoom/Scripts/Client/UI/MainMenuUI.cs
-
9Assets/BossRoom/Scripts/Server/Game/Action/ActionPlayer.cs
-
22Assets/BossRoom/Scripts/Server/Game/Action/ChaseAction.cs
-
2Assets/BossRoom/Scripts/Server/Game/Action/MeleeAction.cs
-
15Assets/BossRoom/Scripts/Server/Game/State/ServerBossRoomState.cs
-
19Assets/BossRoom/Scripts/Server/Net/ServerGameNetPortal.cs
-
20Assets/BossRoom/Scripts/Server/ServerCharacterMovement.cs
-
69Assets/BossRoom/Scripts/Shared/Game/Action/ActionRequestData.cs
-
2Assets/BossRoom/Scripts/Shared/Net/GameNetPortal.cs
-
78Assets/BossRoom/Scripts/Shared/NetworkCharacterState.cs
-
8Packages/packages-lock.json
-
44ProjectSettings/DynamicsManager.asset
-
59ProjectSettings/GraphicsSettings.asset
-
12ProjectSettings/ProjectSettings.asset
-
79Assets/BossRoom/Material/Characters/Enemy_Eyes_sheet.mat
-
8Assets/BossRoom/Material/Characters/Enemy_Eyes_sheet.mat.meta
-
84Assets/BossRoom/Material/Characters/Enemy_Mouth_sheet.mat
-
8Assets/BossRoom/Material/Characters/Enemy_Mouth_sheet.mat.meta
-
83Assets/BossRoom/Material/Characters/ToonTest/Head_Imp.mat
-
8Assets/BossRoom/Material/Characters/ToonTest/Head_Imp.mat.meta
-
83Assets/BossRoom/Material/Characters/ToonTest/Torso_Imp.mat
-
8Assets/BossRoom/Material/Characters/ToonTest/Torso_Imp.mat.meta
-
408Assets/BossRoom/Models/BossSetController.controller
-
8Assets/BossRoom/Models/BossSetController.controller.meta
-
1001Assets/BossRoom/Prefabs/Character/Boss.prefab
-
7Assets/BossRoom/Prefabs/Character/Boss.prefab.meta
-
1001Assets/BossRoom/Prefabs/Character/Imp.prefab
-
7Assets/BossRoom/Prefabs/Character/Imp.prefab.meta
-
1Assets/BossRoom/Textures/Characters/Imp_Head_CLR.tga
-
96Assets/BossRoom/Textures/Characters/Imp_Head_CLR.tga.meta
-
1001Assets/BossRoom/Textures/Characters/Imp_Torso_CLR.tga
-
96Assets/BossRoom/Textures/Characters/Imp_Torso_CLR.tga.meta
-
29Assets/BossRoom/Scripts/Development/dgtest/Animate_Walk.cs
-
11Assets/BossRoom/Scripts/Development/dgtest/Animate_Walk.cs.meta
-
11Assets/BossRoom/Scripts/Development/dgtest/GameManager.cs.meta
-
27Assets/BossRoom/Scripts/Development/dgtest/GroundDiscManager.cs
-
11Assets/BossRoom/Scripts/Development/dgtest/GroundDiscManager.cs.meta
-
40Assets/BossRoom/Scripts/Development/dgtest/MainMenuFX.cs
-
11Assets/BossRoom/Scripts/Development/dgtest/MainMenuFX.cs.meta
-
11Assets/BossRoom/Scripts/Development/dgtest/MainMenuManager.cs.meta
-
8Assets/BossRoom/Scripts/Development/dgtest/Movement.meta
-
11Assets/BossRoom/Scripts/Development/dgtest/ProgramState.cs.meta
-
2Assets/BossRoom/Scripts/Development/dgtest/README.txt
-
7Assets/BossRoom/Scripts/Development/dgtest/README.txt.meta
-
125Assets/BossRoom/Scripts/Development/dgtest/SimpleInputMover.cs
-
11Assets/BossRoom/Scripts/Development/dgtest/SimpleInputMover.cs.meta
-
23Assets/BossRoom/Scripts/Development/dgtest/GameManager.cs
-
36Assets/BossRoom/Scripts/Development/dgtest/MainMenuManager.cs
-
34Assets/BossRoom/Scripts/Development/dgtest/ProgramState.cs
-
0/Assets/BossRoom/Prefabs/Character/Boss_deprecated.prefab.meta
-
0/Assets/BossRoom/Prefabs/Character/Boss_deprecated.prefab
-
0/Assets/BossRoom/Scripts/Client/Net/ClientGameNetPortal.cs.meta
-
0/Assets/BossRoom/Scripts/Client/Net/ClientGameNetPortal.cs
-
0/Assets/BossRoom/Scripts/Server/Net/ServerGameNetPortal.cs.meta
-
0/Assets/BossRoom/Scripts/Server/Net/ServerGameNetPortal.cs
-
0/Assets/BossRoom/Scripts/Shared/Net/GameNetPortal.cs.meta
-
0/Assets/BossRoom/Scripts/Shared/Net/GameNetPortal.cs
478
Assets/BossRoom/Prefabs/Character/CharacterSet.prefab
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
869
Assets/BossRoom/Scenes/DungeonTest.unity
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件