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 |
|
MinhHai
|
b342407c9f
|
DONE: Fix compress method of AFILEPACKAGE
|
2026-02-27 15:50:32 +07:00 |
|
VuNgocHaiC7
|
b60fe6fa6f
|
update code DlgPetRec
|
2026-02-27 15:34:12 +07:00 |
|
VuNgocHaiC7
|
8f8607ece6
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui
|
2026-02-27 13:33:08 +07:00 |
|
VuNgocHaiC7
|
1af61057e0
|
update code DlgPetRec
|
2026-02-27 13:32:18 +07:00 |
|
HungDK
|
b4cc2717c9
|
Merge branch 'develop' into feature/hp_pet
|
2026-02-27 10:34:38 +07:00 |
|
Tungdv
|
f85f1add54
|
fix: update logic hatch pet egg.
|
2026-02-26 20:22:07 +07:00 |
|
GiGiDreamsQuest
|
02be4f4656
|
currently working prefab dlgpetRec
|
2026-02-26 18:11:33 +07:00 |
|
Chomper9981
|
07cee60bf1
|
Merge branch 'develop' of ssh://git.pthub.vn:3222/Unity/perfect-world-unity into feature-develop
|
2026-02-26 17:33:50 +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 |
|
HungDK
|
9592a83a37
|
Merge branch 'develop' into feature/character_info
|
2026-02-26 17:05:23 +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
|
cfdd048415
|
Merge branch 'develop' into feature/skill-set-shortcut
# Conflicts:
# Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs
# Assets/PerfectWorld/Scripts/DebugCommandMenu.meta
|
2026-02-26 15:30:49 +07:00 |
|
VDH
|
abcf251e77
|
fix micro bug
|
2026-02-26 15:27:18 +07:00 |
|
VuNgocHaiC7
|
fbfeefd4b9
|
Merge branch 'develop' of https://git.pthub.vn/Unity/perfect-world-unity into feature/fix-ui
# Conflicts:
# Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
|
2026-02-26 14:26:29 +07:00 |
|
VuNgocHaiC7
|
8df945151d
|
update prefab DlgPetHatch
|
2026-02-26 14:24:30 +07:00 |
|
HungDK
|
22a8254328
|
Merge branch 'develop' into feature/character_info
|
2026-02-26 09:21:28 +07:00 |
|
HungDK
|
76e5c44e39
|
Handle hide option panel
|
2026-02-26 09:18:57 +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 |
|
MinhHai
|
e8102b8266
|
WIP: change type field of struct in EC_CONFIG
|
2026-02-25 16:07:56 +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 |
|
NguyenVanDat
|
f403b24060
|
fix message box display in line
|
2026-02-25 11:12:12 +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 |
|
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 |
|
HungDK
|
d066a1a541
|
Merge remote-tracking branch 'origin/develop' into feature/character_info
|
2026-02-24 11:12:38 +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 |
|
Le Duc Anh
|
0e6ceaf6f3
|
Play from Bootstrap scene. Move heavy logic to other Thread
|
2026-02-20 01:20:05 +07:00 |
|
Le Duc Anh
|
21754a63e7
|
Load object base on distance v1 - without loading screen
|
2026-02-16 13:46:16 +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 |
|
hoangvd
|
cb18c63c87
|
Merge pull request 'adjust UI layout add logic disable UI for quickbar UI' (#159) from feature/skill-set-shortcut into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/159
|
2026-02-11 09:57:56 +00:00 |
|
Le Duc Anh
|
00c0e1d88a
|
fix some minor issues
|
2026-02-11 16:43:53 +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 |
|
MinhHai
|
4df362fd16
|
add logic for SaveConfig, avoid Send to Server
|
2026-02-11 14:54:51 +07:00 |
|
NguyenVanDat
|
a66bffd9d8
|
fix clear slot index
|
2026-02-11 11:32:11 +07:00 |
|
VDH
|
b5184947f2
|
Merge branch 'develop' into feature/skill-set-shortcut
|
2026-02-11 10:50:17 +07:00 |
|
NguyenVanDat
|
efb1825422
|
Merge branch 'develop' into feature/clear-embedded-chip
|
2026-02-11 10:21:47 +07:00 |
|
Chomper9981
|
2e04507aa6
|
Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game
|
2026-02-10 12:16:25 +07:00 |
|
Chomper9981
|
a86e15e48a
|
Fix bug cant get "Lan xi ki di" in main quest progress
|
2026-02-10 12:14:47 +07:00 |
|
NguyenVanDat
|
e4909c1658
|
update logic clear chip
|
2026-02-10 11:51:26 +07:00 |
|
HungDK
|
a295b3402e
|
HUD and else player interact
|
2026-02-09 18:07:56 +07:00 |
|
Le Duc Anh
|
72c72bd8e5
|
modify login scene
|
2026-02-09 18:06:59 +07:00 |
|