 MinhHai
|
7c3bc44bd7
|
Merge branch 'feature/convert-task-templ' into develop
|
2025-11-03 18:34:36 +07:00 |
|
|
MinhHai
|
a8822700bb
|
fix bug missing namespace after merge from develop
|
2025-11-03 17:36:42 +07:00 |
|
|
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 |
|
|
MinhHai
|
e21fbc4021
|
complete read properties of Task
|
2025-11-03 17:26:34 +07:00 |
|
|
HungDK
|
33c845cd3b
|
Merge branch 'develop' into feature/inventories
|
2025-10-30 10:10:16 +07:00 |
|
|
NguyenVanDat
|
51659d03cc
|
fixx
|
2025-10-29 17:05:57 +07:00 |
|
|
HungDK
|
cbfceab8ac
|
Add sfx login
|
2025-10-29 17:02:43 +07:00 |
|
|
HungDK
|
0fb8b0d406
|
Update login UI
|
2025-10-29 17:02:18 +07:00 |
|
|
NguyenVanDat
|
cc32356d10
|
Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scenes/a61.unity
# Assets/Scripts/CECHostPlayer.cs
|
2025-10-29 17:01:15 +07:00 |
|
|
NguyenVanDat
|
1dd66a2b83
|
pj setting
|
2025-10-29 16:41:07 +07:00 |
|
|
Tungdv
|
fbd3110d05
|
fix: update pos server for HP and add layer for terrain.
|
2025-10-29 16:25:42 +07:00 |
|
|
Tungdv
|
0d41cbfe44
|
Merge branch 'develop' into feature/EP_normal_attack
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/CECNPCMan.cs
# Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
# Assets/PerfectWorld/Scripts/NPC/CECNPCModelDefaultPolicy.cs
# Assets/Prefabs/MonsterPrefab.prefab
# Assets/Scenes/WorldRender.unity
# Assets/Scenes/a61.unity.meta
# Assets/Scripts/CECHostPlayer.cs
|
2025-10-29 15:48:29 +07:00 |
|
|
NguyenVanDat
|
929f35bd3b
|
st
|
2025-10-29 13:30:02 +07:00 |
|
|
Tungdv
|
4283029b1f
|
fix: update auto move for HP.
|
2025-10-28 19:20:41 +07:00 |
|
|
NguyenVanDat
|
59e06cc5f3
|
fix bug
|
2025-10-28 17:56:33 +07:00 |
|
|
NguyenVanDat
|
777bda9cd9
|
inffo
|
2025-10-28 17:51:50 +07:00 |
|
|
NguyenVanDat
|
0d358f867d
|
ui info hosst player and npc done
|
2025-10-28 17:22:03 +07:00 |
|
|
NguyenVanDat
|
46eb3afe2b
|
Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
# Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
# Assets/Scenes/NPCRender.unity
|
2025-10-28 11:05:11 +07:00 |
|
|
NguyenVanDat
|
254df2c428
|
ForTest
|
2025-10-28 10:55:52 +07:00 |
|
|
NguyenVanDat
|
aca798172c
|
testfast
|
2025-10-28 10:31:28 +07:00 |
|
|
HungDK
|
0ae982ae80
|
Merge branch 'feature/inventories' into develop
|
2025-10-27 15:45:29 +07:00 |
|
|
HungDK
|
13d1283d6e
|
Fix money and cash loader
|
2025-10-27 15:39:45 +07:00 |
|
|
NguyenVanDat
|
d72d4cd967
|
Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
# Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
|
2025-10-27 13:41:59 +07:00 |
|
|
VDH
|
6b91faae68
|
npc
|
2025-10-27 11:47:33 +07:00 |
|
|
HungDK
|
0eed221f16
|
Fix merge conflict
|
2025-10-27 11:28:22 +07:00 |
|
|
HungDK
|
a2469d0259
|
Merge branch 'develop' into feature/inventories
|
2025-10-27 10:33:38 +07:00 |
|
|
VDH
|
f537fc0551
|
npc
|
2025-10-27 10:23:44 +07:00 |
|
|
HungDK
|
dd8858b8a5
|
Update icon mall
|
2025-10-27 09:39:27 +07:00 |
|
|
VDH
|
7fef48278f
|
addressable ui
|
2025-10-25 17:28:46 +07:00 |
|
|
HungDK
|
bd34b294f9
|
Add player currency
|
2025-10-25 17:07:54 +07:00 |
|
|
VDH
|
f08f357aa8
|
Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
|
2025-10-25 13:56:32 +07:00 |
|
|
Le Duc Anh
|
6a951cebdf
|
load a61 scene
|
2025-10-25 12:32:56 +07:00 |
|
|
Tungdv
|
b4f2e78def
|
fix: update logic move HP.
|
2025-10-24 18:53:46 +07:00 |
|
|
VDH
|
7c88068369
|
npc server name
|
2025-10-24 10:18:56 +07:00 |
|
|
tung.do@monkey.edu.vn
|
63c566cdc7
|
feat: add package addresable.
fix: update logic auto move HP.
|
2025-10-24 00:33:55 +07:00 |
|
|
Tungdv
|
ef50c760fa
|
fix: Update move HP.
|
2025-10-23 19:05:03 +07:00 |
|
|
VDH
|
c0d4478b38
|
name npc
|
2025-10-23 17:33:12 +07:00 |
|
|
HungDK
|
d293f2ab52
|
Update EC_StringTab.cs
|
2025-10-23 10:52:24 +07:00 |
|
|
HungDK
|
788e6d4bcc
|
Update EC_Game.cs
|
2025-10-23 10:51:14 +07:00 |
|
|
HungDK
|
845f957fa9
|
Update EC_IvtrEquip.cs
|
2025-10-23 10:49:56 +07:00 |
|
|
HungDK
|
9f4603a4bf
|
Update EC_InventoryUI.cs
|
2025-10-23 10:49:49 +07:00 |
|
|
Tungdv
|
f679a4b94c
|
Merge branch 'develop' into feature/EP_normal_attack
|
2025-10-22 17:15:07 +07:00 |
|
|
Tungdv
|
68d0cc4748
|
fix: update show anim attack for else player.
|
2025-10-22 17:14:36 +07:00 |
|
|
Le Duc Anh
|
220b222013
|
update subfix of addressable also
|
2025-10-22 16:43:10 +07:00 |
|
|
Le Duc Anh
|
e839141eb5
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop
|
2025-10-22 16:35:41 +07:00 |
|
|
Le Duc Anh
|
9fa1c93e27
|
addressable intial commit
|
2025-10-22 16:34:56 +07:00 |
|
|
Tungdv
|
b69975eaf3
|
Merge branch 'develop' into feature/EP_normal_attack
|
2025-10-22 14:49:58 +07:00 |
|
|
Tungdv
|
10b0b1825f
|
fix: remove "dynamic".
|
2025-10-22 14:45:31 +07:00 |
|
|
VDH
|
5f38710c4a
|
npc and monster done
|
2025-10-22 13:42:55 +07:00 |
|
|
VDH
|
eaf07bd223
|
Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
|
2025-10-22 09:26:38 +07:00 |
|