MinhHai c9cd71c3f9 Merge branch 'develop' into feature/convert-task-templ ...

# Conflicts:
#	Assets/PerfectWorld/Scripts/Task/ATaskTemplFixedData.cs
#	Assets/PerfectWorld/Scripts/Task/ATaskTemplFixedData.cs.meta
#	Assets/PerfectWorld/Scripts/Task/AWARD_DATA.cs
#	Assets/PerfectWorld/Scripts/Task/AWARD_DATA.cs.meta
#	Assets/PerfectWorld/Scripts/Task/AWARD_ITEMS_CAND.cs
#	Assets/PerfectWorld/Scripts/Task/AWARD_ITEMS_CAND.cs.meta
#	Assets/PerfectWorld/Scripts/Task/SizeTest.cs
#	Assets/PerfectWorld/Scripts/Task/SizeTest.cs.meta
#	Assets/PerfectWorld/Scripts/Task/TaskExpAnalyser.cs
#	Assets/PerfectWorld/Scripts/Task/TaskLog.txt
#	Assets/PerfectWorld/Scripts/Task/TaskLog.txt.meta
#	Assets/Scenes/HoangTest.unity

2025-11-03 17:30:47 +07:00

..

configs

Fix merge conflix

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

data

add data files

2025-10-07 09:21:44 +07:00

configs.meta

StringTab

2025-10-11 15:57:15 +07:00

data.meta

add data files

2025-10-07 09:21:44 +07:00

elements.data

Change metadata to vietnamese

2025-09-16 08:59:27 +07:00

elements.data.meta

elementdataman

2025-09-13 14:58:00 +07:00

gshop1.data

Add gshop data

2025-10-14 10:53:35 +07:00

gshop1.data.meta

Add gshop data

2025-10-14 10:53:35 +07:00

gshop.data

Add gshop data

2025-10-14 10:53:35 +07:00

gshop.data.meta

Add gshop data

2025-10-14 10:53:35 +07:00