 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 |
|
|
hoangvd
|
a734e79dfa
|
Merge pull request 'feature/HostAttack_Hoang' (#36) from feature/HostAttack_Hoang into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/36
|
2025-10-27 07:01:48 +00: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
|
d71487a81e
|
add a61 scene
|
2025-10-25 12:33:33 +07:00 |
|
|
Le Duc Anh
|
6a951cebdf
|
load a61 scene
|
2025-10-25 12:32:56 +07:00 |
|
|
Le Duc Anh
|
61929d7b1a
|
add new assets
|
2025-10-25 12:27:22 +07:00 |
|
|
Le Duc Anh
|
2480321357
|
Configure Git LFS to track .unity files
|
2025-10-24 11:24:33 +07:00 |
|
|
VDH
|
7c88068369
|
npc server name
|
2025-10-24 10:18:56 +07:00 |
|
|
hoangvd
|
cd9e4e8fcc
|
Merge pull request 'name npc' (#35) from feature/HostAttack_Hoang into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/35
|
2025-10-23 10:34:23 +00:00 |
|
|
VDH
|
c0d4478b38
|
name npc
|
2025-10-23 17:33:12 +07:00 |
|
|
HungDK
|
73f187968b
|
Update LoginScene.unity
|
2025-10-23 10:52:35 +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
|
54d88b30ab
|
Merge pull request 'fix: update show anim EP normal attack' (#34) from feature/EP_normal_attack into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/34
|
2025-10-22 10:15:47 +00: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
|
ed70b764b0
|
Merge pull request 'fix: remove "dynamic".' (#33) from feature/EP_normal_attack into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/33
|
2025-10-22 07:52:14 +00: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 |
|
|
hoangvd
|
46ccb7d16e
|
Merge pull request 'npc and monster done' (#32) from feature/HostAttack_Hoang into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/32
|
2025-10-22 06:48:47 +00:00 |
|
|
VDH
|
5f38710c4a
|
npc and monster done
|
2025-10-22 13:42:55 +07:00 |
|
|
hoangvd
|
e95d5c660d
|
Merge pull request 'feature/HostAttack_Hoang' (#31) from feature/HostAttack_Hoang into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/31
|
2025-10-22 02:30:09 +00:00 |
|
|
VDH
|
eaf07bd223
|
Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
|
2025-10-22 09:26:38 +07:00 |
|
|
tungdv
|
ac2e48f3cc
|
Merge pull request 'feat: Add logic EP normal attack' (#30) from feature/EP_normal_attack into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/30
|
2025-10-21 12:14:12 +00:00 |
|
|
Tungdv
|
776ac0fa5d
|
feat: add logic else player action normal attack.
|
2025-10-21 19:12:23 +07:00 |
|
|
HungDK
|
168da10d1a
|
Update LoginScene.unity
|
2025-10-21 18:50:44 +07:00 |
|
|
HungDK
|
cabb293722
|
Update SelectCharacterUI.prefab
|
2025-10-21 18:50:38 +07:00 |
|
|
HungDK
|
64e5450d37
|
Update LoginScreenUI.cs
|
2025-10-21 18:50:33 +07:00 |
|
|
HungDK
|
82b8b3c705
|
Add role select button
|
2025-10-21 18:49:54 +07:00 |
|
|
VDH
|
02df4f3c6f
|
monster attack
|
2025-10-21 18:34:45 +07:00 |
|
|
HungDK
|
9842d9960c
|
Update EC_InventoryUI.cs
|
2025-10-21 16:56:15 +07:00 |
|
|
HungDK
|
8a9449330f
|
Update InventoryUI.prefab
|
2025-10-21 16:56:01 +07:00 |
|
|
HungDK
|
d522849dba
|
Add equipment item data handler
|
2025-10-21 16:55:57 +07:00 |
|
|
HungDK
|
bad4451ffc
|
Add textfomatter to apply color, drop down
|
2025-10-21 16:55:22 +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 |
|
|
hoangvd
|
fa6db3e0ca
|
Merge pull request 'feature/HostAttack_Hoang' (#29) from feature/HostAttack_Hoang into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/29
|
2025-10-20 09:38:27 +00:00 |
|