 HungDK
|
ea53c30306
|
Merge branch 'feature/mall' into develop
|
2025-11-12 09:27:12 +07:00 |
|
|
VDH
|
40f17dadab
|
Merge remote-tracking branch 'origin/develop' into feature/skill-data
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scenes/NPCRender.unity
# Assets/Scenes/a61.unity
# Assets/Scripts/CECHostPlayer.cs
|
2025-11-11 13:44:45 +07:00 |
|
|
VDH
|
cbf626fa28
|
skill processing
|
2025-11-11 13:33:27 +07:00 |
|
|
HungDK
|
f58d00a4ac
|
Update shop categories
|
2025-11-10 16:13:31 +07:00 |
|
|
HungDK
|
32d0aeff3a
|
Fix unexpect item order in each tab of mall
|
2025-11-10 10:52:05 +07:00 |
|
|
VDH
|
d4af8e33f9
|
convert for test done
|
2025-11-07 18:01:47 +07:00 |
|
|
Le Duc Anh
|
f338899f76
|
initial load all equipments
|
2025-11-05 16:08:51 +07:00 |
|
|
HungDK
|
1f7c20069c
|
Merge branch 'develop' into feature/revive
|
2025-11-04 14:51:15 +07:00 |
|
|
HungDK
|
8278709a45
|
Add prefab and ui of revive system
|
2025-11-04 14:30:25 +07:00 |
|
|
PCBrew
|
61775198c6
|
Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
|
2025-11-03 17:37:16 +07:00 |
|
|
PCBrew
|
1c9d9b9ec2
|
UI health change fix bug
|
2025-10-30 18:50:02 +07:00 |
|
|
HungDK
|
33c845cd3b
|
Merge branch 'develop' into feature/inventories
|
2025-10-30 10:10:16 +07:00 |
|
|
HungDK
|
0fb8b0d406
|
Update login UI
|
2025-10-29 17:02:18 +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 |
|
|
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 |
|
|
Le Duc Anh
|
6a951cebdf
|
load a61 scene
|
2025-10-25 12:32:56 +07:00 |
|
|
VDH
|
c0d4478b38
|
name npc
|
2025-10-23 17:33:12 +07:00 |
|
|
VDH
|
5f38710c4a
|
npc and monster done
|
2025-10-22 13:42:55 +07:00 |
|
|
HungDK
|
64e5450d37
|
Update LoginScreenUI.cs
|
2025-10-21 18:50:33 +07:00 |
|
|
Tungdv
|
3a05b94366
|
Merge branch 'develop' into feature/hp_normal_attack
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/CECNPCMan.cs
# Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMelee.cs
# Assets/PerfectWorld/Scripts/Managers/EC_HPWorkTrace.cs
# Assets/PerfectWorld/Scripts/Managers/EC_HostPlayer.cs
# Assets/PerfectWorld/Scripts/Managers/EC_ManMatter.cs
# Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
# Assets/PerfectWorld/Scripts/Managers/EC_Object.cs
# Assets/PerfectWorld/Scripts/Move/CECHostMove.cs
# Assets/PerfectWorld/Scripts/NPC/CECMonster.cs
# Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
# Assets/PerfectWorld/Scripts/NPC/CECNPCModelDefaultPolicy.cs
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
# Assets/PerfectWorld/Scripts/PlayerState/PlayerIdleState.cs
# Assets/PerfectWorld/Scripts/PlayerState/PlayerMoveState.cs
# Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs
# Assets/PerfectWorld/Scripts/UI/pickupItem.cs
# Assets/Scripts/CECHostPlayer.cs
# Assets/Scripts/EC_Utility.cs
# Assets/Scripts/GameController.cs
# Assets/Scripts/InitializePlayer.cs
# Assets/Scripts/Move/EC_Player.cs
# Assets/Scripts/PlayerVisual.cs
|
2025-10-20 16:58:20 +07:00 |
|
|
VDH
|
9a744151ee
|
2010
|
2025-10-20 09:50:23 +07:00 |
|
|
HungDK
|
9d5545199d
|
Merge branch 'develop' into feature/inventory
|
2025-10-18 14:45:23 +07:00 |
|
|
HungDK
|
e9c69ab511
|
Add buy cmd
|
2025-10-17 17:53:34 +07:00 |
|
|
HungDK
|
94e3ba12b3
|
Add load icon, image, detail
|
2025-10-16 17:49:30 +07:00 |
|
|
VDH
|
8eafdb2ed2
|
npc die done
|
2025-10-16 16:28:29 +07:00 |
|
|
VDH
|
32e42d2db8
|
npc leave after die
|
2025-10-16 10:53:05 +07:00 |
|
|
HungDK
|
1beb754cd2
|
Add local data loader shop
|
2025-10-16 10:25:49 +07:00 |
|
|
VDH
|
432004b5b4
|
npcdie
|
2025-10-16 09:10:20 +07:00 |
|
|
Tungdv
|
001a16cf32
|
fix: update namespace.
feat: add new logic EC_World.
|
2025-10-14 18:34:16 +07:00 |
|
|
VDH
|
dce34489ed
|
Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
|
2025-10-14 17:13:58 +07:00 |
|
|
VDH
|
4f06139b2e
|
fix bug animation wound npc
|
2025-10-14 14:57:19 +07:00 |
|
|
HungDK
|
0389950579
|
Merge branch 'develop' into feature/inventory
|
2025-10-14 11:17:32 +07:00 |
|
|
Le Duc Anh
|
258798ebde
|
save username password to player prefs
|
2025-10-14 10:43:04 +07:00 |
|
|
VDH
|
7bc5c65229
|
animation attack done
|
2025-10-13 16:58:06 +07:00 |
|
|
VDH
|
bd344fcff5
|
player animation
|
2025-10-11 16:09:00 +07:00 |
|
|
VDH
|
bcba39d951
|
reset
|
2025-10-11 10:02:52 +07:00 |
|
|
hoangvd
|
38a12bd3fa
|
revert 439722a8c4
revert Merge pull request 'feature/movement' (#22) from feature/movement into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/22
mất package
|
2025-10-09 11:06:44 +00:00 |
|
|
HungDK
|
7a000797ec
|
Update place holder item drop object
|
2025-10-09 17:04:07 +07:00 |
|