Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts: # Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs # Assets/Scenes/a61.unity # Assets/Scripts/CECHostPlayer.cs
This commit is contained in:
@@ -11,8 +11,8 @@ TagManager:
|
||||
- Player
|
||||
- Water
|
||||
- UI
|
||||
-
|
||||
-
|
||||
- Terrain
|
||||
- Bush
|
||||
-
|
||||
-
|
||||
-
|
||||
|
||||
Reference in New Issue
Block a user