 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 |
|
|
HungDK
|
929913003a
|
Fix merge conflix
|
2025-10-14 11:24:10 +07:00 |
|
|
HungDK
|
0389950579
|
Merge branch 'develop' into feature/inventory
|
2025-10-14 11:17:32 +07:00 |
|
|
HungDK
|
3695dd2262
|
Add gshop data
|
2025-10-14 10:53:35 +07:00 |
|
|
Le Duc Anh
|
142611dddd
|
StringTab
|
2025-10-11 15:57:15 +07:00 |
|
|
Le Duc Anh
|
3c8947422e
|
add data files
|
2025-10-07 09:21:44 +07:00 |
|
|
HungDK
|
4773d92256
|
Change metadata to vietnamese
|
2025-09-16 08:59:27 +07:00 |
|
|
Le Duc Anh
|
fc3e8c4b82
|
elementdataman
|
2025-09-13 14:58:00 +07:00 |
|