Merge branch 'develop' into feature/hp_interact_npc
# Conflicts: # Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs # Assets/PerfectWorld/Scripts/MainFiles/CECGameRun.cs # Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs # Assets/PerfectWorld/Scripts/Move/CECPlayer.cs # Assets/PerfectWorld/Scripts/NPC/CECNPC.cs # Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs # Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs # Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs # Assets/Scenes/a61.unity # Assets/Scripts/CECHostPlayer.cs # Assets/Scripts/CECUIManager.cs
This commit is contained in:
@@ -82,7 +82,7 @@ PlayerSettings:
|
||||
androidApplicationEntry: 2
|
||||
defaultIsNativeResolution: 1
|
||||
macRetinaSupport: 1
|
||||
runInBackground: 0
|
||||
runInBackground: 1
|
||||
muteOtherAudioSources: 0
|
||||
Prepare IOS For Recording: 0
|
||||
Force IOS Speakers When Recording: 0
|
||||
@@ -784,7 +784,7 @@ PlayerSettings:
|
||||
PS4: DOTWEEN
|
||||
PS5: DOTWEEN
|
||||
QNX: DOTWEEN
|
||||
Standalone: DOTWEEN;TESTFAST
|
||||
Standalone: DOTWEEN;TESTFAST;_TASK_CLIENT
|
||||
VisionOS: DOTWEEN
|
||||
WebGL: DOTWEEN
|
||||
Windows Store Apps: DOTWEEN
|
||||
|
||||
Reference in New Issue
Block a user