duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
9feb2b22e3ea1a1a90f370a0c5bea316b14be759
test/ProjectSettings
T
History
Tungdv 9feb2b22e3 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
2025-11-12 19:39:19 +07:00
..
AudioManager.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
ClusterInputManager.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
DynamicsManager.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
EditorBuildSettings.asset
pj setting
2025-10-29 16:41:07 +07:00
EditorSettings.asset
st
2025-10-16 16:29:02 +07:00
GraphicsSettings.asset
testfast
2025-10-28 10:31:28 +07:00
InputManager.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
MemorySettings.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
MultiplayerManager.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
NavMeshAreas.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
PackageManagerSettings.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
Physics2DSettings.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
PresetManager.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
ProjectSettings.asset
Merge branch 'develop' into feature/hp_interact_npc
2025-11-12 19:39:19 +07:00
ProjectVersion.txt
increase project version
2025-10-08 10:12:49 +07:00
QualitySettings.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
SceneTemplateSettings.json
revert 439722a8c4
2025-10-09 11:06:44 +00:00
ScriptableBuildPipeline.json
addressable intial commit
2025-10-22 16:34:56 +07:00
ShaderGraphSettings.asset
st
2025-10-09 18:16:02 +07:00
TagManager.asset
fix: Update move HP.
2025-10-23 19:05:03 +07:00
TimeManager.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
UnityConnectSettings.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
URPProjectSettings.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
VersionControlSettings.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
VFXManager.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00
XRSettings.asset
revert 439722a8c4
2025-10-09 11:06:44 +00:00