test/Assets/PerfectWorld/Editor.meta at feature/world-map - test - Gitea: Git with a cup of tea

duongtx/test

Files

T

VDH 3450fd015f Merge branch 'develop' into feature/skill-data

# Conflicts:
#	Assets/PerfectWorld/Config.meta
#	Assets/PerfectWorld/Editor.meta
#	Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/CSNetwork.csproj.meta
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.Task.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECPlayer_Inventory.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

2025-11-24 10:16:07 +07:00

13 lines

315 B

Plaintext

Raw Permalink Blame History

 fileFormatVersion: 2
 <<<<<<<< HEAD:Assets/PerfectWorld/Editor.meta
 guid: 75a0cc0fd8902794a883916febf9855b
 ========
 guid: f0e041e8264a83545bf6e555757c9851
 >>>>>>>> develop:Assets/PerfectWorld/Config.meta
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData:
   assetBundleName:
   assetBundleVariant: