 MinhHai
|
cee2eb74f7
|
Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
# Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
|
2026-02-27 15:56:39 +07:00 |
|
|
HungDK
|
dcd1aac3c7
|
Fixing missing msg handle
|
2026-02-26 17:28:37 +07:00 |
|
|
MinhHai
|
a9eb777799
|
Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
# Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
|
2026-02-25 16:11:52 +07:00 |
|
|
Chomper9981
|
7ddd60e7e1
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-02-25 14:41:37 +07:00 |
|
|
Chomper9981
|
cad727b814
|
Fix the nav bug(work around). fix the major map quest's npc load proplem.
|
2026-02-25 14:41:15 +07:00 |
|
|
HungDK
|
6db18f3013
|
Merge branch 'develop' into feature/character_info
|
2026-02-25 13:39:56 +07:00 |
|
|
HungDK
|
34dbaa4c0a
|
Fixing select target and id duel
|
2026-02-25 13:38:33 +07:00 |
|
|
NguyenVanDat
|
d1c802586e
|
Merge branch 'develop' into feature/clear-embedded-chip
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-25 10:50:13 +07:00 |
|
|
NguyenVanDat
|
b4b2f9ac96
|
finish clear tessera
|
2026-02-25 10:26:49 +07:00 |
|
|
HungDK
|
7996bed176
|
Fix PvP conflict
|
2026-02-24 16:59:51 +07:00 |
|
|
HungDK
|
cab2c0af45
|
Merge branch 'develop' into feature/character_info
|
2026-02-24 15:33:53 +07:00 |
|
|
MinhHai
|
aa53269f35
|
Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
# Assets/Scripts/CECHostPlayer.Task.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-24 14:35:11 +07:00 |
|
|
HungDK
|
d066a1a541
|
Merge remote-tracking branch 'origin/develop' into feature/character_info
|
2026-02-24 11:12:38 +07:00 |
|
|
NguyenVanDat
|
2d85773f0e
|
REFACTOR CECHostPlayer
separate class to partial class
|
2026-02-24 10:57:12 +07:00 |
|
|
Le Duc Anh
|
050bf5e9c8
|
v
|
2026-02-21 23:33:08 +07:00 |
|
|
Le Duc Anh
|
0e6ceaf6f3
|
Play from Bootstrap scene. Move heavy logic to other Thread
|
2026-02-20 01:20:05 +07:00 |
|
|
VuNgocHaiC7
|
366001be85
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/update_dlgInstall
|
2026-02-11 17:37:06 +07:00 |
|
|
VuNgocHaiC7
|
363520be53
|
update info item for dlgInstall after the merge
|
2026-02-11 17:36:16 +07:00 |
|
|
MinhHai
|
125229cae5
|
Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
# Assets/PerfectWorld/Scripts/Task/UI/DlgTask.cs
|
2026-02-11 14:56:21 +07:00 |
|
|
MinhHai
|
4df362fd16
|
add logic for SaveConfig, avoid Send to Server
|
2026-02-11 14:54:51 +07:00 |
|
|
Tungdv
|
5787b1b088
|
fix: fix bug swim HP.
|
2026-02-10 18:36:33 +07:00 |
|
|
Tungdv
|
20f0812254
|
fix: fix bug logic swim HP.
|
2026-02-10 18:35:25 +07:00 |
|
|
Tungdv
|
ea437dca63
|
fix: update logic move with brush.
|
2026-02-10 17:58:13 +07:00 |
|
|
Tungdv
|
1f4671ee46
|
Merge branch 'develop' into feature/hp_swim
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
|
2026-02-10 14:25:14 +07:00 |
|
|
Tungdv
|
077a76f77e
|
fix: test move with brush.
|
2026-02-10 11:12:12 +07:00 |
|
|
HungDK
|
750e7b4ff8
|
Handle logic of Duel
|
2026-02-09 18:07:37 +07:00 |
|
|
VDH
|
8bce2d6b06
|
tesst skill
|
2026-02-09 15:15:31 +07:00 |
|
|
MinhHai
|
d160df064d
|
Merge remote-tracking branch 'origin/develop' into feature/save-skill-combo
# Conflicts:
# Assets/PerfectWorld/Prefab/UIManager.prefab
# Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
|
2026-02-09 14:44:12 +07:00 |
|
|
VDH
|
781c5cd08d
|
done passive skill UI
|
2026-02-06 15:13:42 +07:00 |
|
|
VDH
|
e4081a94c9
|
fix after merge
|
2026-02-06 09:30:08 +07:00 |
|
|
VDH
|
b70f68fe81
|
Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
# Assets/Scenes/a61.unity
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-05 17:41:50 +07:00 |
|
|
Tungdv
|
7a96c7e252
|
Merge remote-tracking branch 'origin/develop' into feature/hp_pet
# Conflicts:
# Assets/AddressableAssetsData/AddressableAssetSettings.asset
# Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
# Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
# Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
# Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
# Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs
# Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPetList.cs.meta
# Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
# Assets/Scenes/a61.unity
# Assets/Scripts/CECGameRun.cs
# Assets/Scripts/CECHostPlayer.cs
# Assets/Scripts/CECUIManager.cs
|
2026-02-05 17:29:54 +07:00 |
|
|
VDH
|
b3e5f2ae61
|
done skill ui execute
|
2026-02-05 17:26:58 +07:00 |
|
|
VDH
|
414562f221
|
done excute skill bar
|
2026-02-05 11:21:49 +07:00 |
|
|
Tungdv
|
cda4e1343a
|
fix: update logic rider pet.
|
2026-02-04 19:27:01 +07:00 |
|
|
MinhHai
|
5dd3dcf48d
|
WIP: add logic and UI
|
2026-02-04 15:17:39 +07:00 |
|
|
Tungdv
|
53f8829413
|
fix: update show pet rider.
|
2026-02-03 19:26:41 +07:00 |
|
|
VuNgocHaiC7
|
bca7fd1c6a
|
fix UI DlgInstall.prefab
|
2026-02-02 18:18:01 +07:00 |
|
|
VuNgocHaiC7
|
f23d7126a7
|
fix CECHostPlayer
|
2026-02-02 16:19:02 +07:00 |
|
|
VDH
|
7091fb8d41
|
Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-02 10:28:42 +07:00 |
|
|
VDH
|
57c2f5fb9f
|
FIX after merge
|
2026-02-02 10:23:49 +07:00 |
|
|
VDH
|
7aaed6d0d3
|
Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs
# Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
# Assets/Scripts/CECGameRun.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-02 09:55:39 +07:00 |
|
|
HungDK
|
793eb7c030
|
Merge branch 'develop' into feature/character_info
|
2026-02-02 09:43:23 +07:00 |
|
|
VDH
|
e91a491444
|
get description skill
|
2026-02-02 09:40:39 +07:00 |
|
|
HungDK
|
ecc3a888ca
|
Add message process
|
2026-02-02 09:12:15 +07:00 |
|
|
Tungdv
|
ef894f6e49
|
fix: update logic pet.
|
2026-01-31 19:23:50 +07:00 |
|
|
Tungdv
|
b5d5ae1982
|
fix: update logic pet.
|
2026-01-29 19:24:57 +07:00 |
|
|
VDH
|
e2e63b83f2
|
convert ui code
|
2026-01-29 19:24:42 +07:00 |
|
|
Chomper9981
|
0821e2f741
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game
|
2026-01-29 17:49:03 +07:00 |
|
|
Chomper9981
|
5aff603a47
|
Add task trace Feature. Modify task UI.
|
2026-01-29 17:42:34 +07:00 |
|