 Tungdv
|
01ae1463f4
|
fix: remove debug and "using" not use.
|
2026-02-28 18:34:39 +07:00 |
|
|
VDH
|
5de380fd05
|
update check condition
|
2026-02-27 18:18:51 +07:00 |
|
|
Le Duc Anh
|
7abe98a4b1
|
Merge remote-tracking branch 'origin/develop' into feature/dynamic-terrain
|
2026-02-27 18:08:59 +07:00 |
|
|
Le Duc Anh
|
469e3f0204
|
fix the issue with terrain holder and TickTask
|
2026-02-27 17:47:26 +07:00 |
|
|
Chomper9981
|
ed4adcfaa0
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-02-27 17:30:14 +07:00 |
|
|
Chomper9981
|
b73de9553e
|
update UI. add more developed feature into UI
|
2026-02-27 17:27:26 +07:00 |
|
|
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 |
|
|
Chomper9981
|
2b869e5285
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-02-26 17:33:31 +07:00 |
|
|
Chomper9981
|
10e4cfa1d3
|
fix bug "dance" quest not working(workaround). Trigger action via action skill table. fix bug some matter object dont have collider(workaround)
|
2026-02-26 17:28:53 +07:00 |
|
|
Tungdv
|
708f33bfe4
|
Merge branch 'develop' into feature/hp_pet
# Conflicts:
# Assets/PerfectWorld/Prefab/UIManager.prefab
# Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
# Assets/PerfectWorld/Scripts/Players/EC_HostMsg.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-02-26 16:39:23 +07:00 |
|
|
Tungdv
|
72ef982527
|
fix: update UI Dialog Pet List.
|
2026-02-26 15:57:36 +07:00 |
|
|
VDH
|
abcf251e77
|
fix micro bug
|
2026-02-26 15:27:18 +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 |
|
|
MinhHai
|
f183544b4d
|
WIP: prepare config before send to Server
|
2026-02-24 14:29:09 +07:00 |
|
|
NguyenVanDat
|
cc04ace9e1
|
Merge branch 'develop' into feature/clear-embedded-chip
# Conflicts:
# Assets/PerfectWorld/Scripts/UI/Dialogs/DlgInstall.cs
|
2026-02-23 15:05:51 +07:00 |
|
|
VDH
|
c04b5b1f09
|
adjust UI layout add logic disable UI for quickbar UI
|
2026-02-11 15:31:37 +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 |
|
|
NguyenVanDat
|
efb1825422
|
Merge branch 'develop' into feature/clear-embedded-chip
|
2026-02-11 10:21:47 +07:00 |
|
|
NguyenVanDat
|
e4909c1658
|
update logic clear chip
|
2026-02-10 11:51:26 +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
|
b3e5f2ae61
|
done skill ui execute
|
2026-02-05 17:26:58 +07:00 |
|
|
MinhHai
|
5dd3dcf48d
|
WIP: add logic and UI
|
2026-02-04 15:17:39 +07:00 |
|
|
VDH
|
eca33817e8
|
done ui info
|
2026-02-03 15:01:57 +07:00 |
|
|
VDH
|
e57899226d
|
infoskill done data
|
2026-02-02 18:16:11 +07:00 |
|
|
VDH
|
f233ebe58b
|
fix
|
2026-02-02 10:42:50 +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
|
00296336f9
|
Show dialog "Win_ArrangeTeam"
|
2026-02-02 09:15:39 +07:00 |
|
|
VDH
|
0de2995ab6
|
done ui action
|
2026-01-30 11:37:10 +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 |
|
|
VuNgocHaiC7
|
8d1965653c
|
update UI of DlgProduce and DlgInstall, chage iconTask
|
2026-01-29 17:39:16 +07:00 |
|
|
VuNgocHaiC7
|
ccbe1b4a0c
|
update feature useitem
|
2026-01-29 17:08:58 +07:00 |
|
|
VuNgocHaiC7
|
d69fed7aea
|
fix conflig use item
|
2026-01-29 14:23:24 +07:00 |
|
|
VuNgocHaiC7
|
2dea3a8f02
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into feature/useItem
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/UI/Dialogs/AUIDialog.cs
|
2026-01-29 14:04:49 +07:00 |
|
|
VuNgocHaiC7
|
8f916ee88c
|
use item but cooldown don't active
|
2026-01-29 13:58:15 +07:00 |
|
|
VDH
|
a3b5a72b9c
|
Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
|
2026-01-28 16:47:35 +07:00 |
|
|
VDH
|
6dbc543188
|
done create new skill combo
|
2026-01-28 16:40:29 +07:00 |
|
|
VDH
|
c22ca07a0f
|
done skill combo
|
2026-01-27 18:04:32 +07:00 |
|
|
HungDK
|
c748d9c39e
|
Merge branch 'develop' into feature/character_info
|
2026-01-27 17:57:39 +07:00 |
|
|
HungDK
|
312edda4aa
|
Fix get character name logic
|
2026-01-27 17:41:33 +07:00 |
|
|
VDH
|
7d9f75de18
|
Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_IvtrItem/EC_IvtrItem.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
# Assets/Scripts/CECHostPlayer.cs
|
2026-01-23 18:08:51 +07:00 |
|
|
VDH
|
3de0850a2b
|
push convert flow use skill combo
|
2026-01-23 18:01:15 +07:00 |
|
|
VuNgocHaiC7
|
ca84a98d31
|
completed task icon head NPC
|
2026-01-23 14:10:56 +07:00 |
|
|
VDH
|
ef366cfc32
|
convert skill combo'
|
2026-01-22 19:23:32 +07:00 |
|