 tungdv
|
f2eee71c9e
|
Merge pull request 'Update select task in dlgnpc.' (#66) from feature/hp_interact_npc into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/66
|
2025-11-21 10:18:53 +00:00 |
|
|
Tungdv
|
9129784de0
|
Merge branch 'develop' into feature/hp_interact_npc
|
2025-11-21 17:07:50 +07:00 |
|
|
MinhHai
|
aa797c8865
|
Merge branch 'implement_task_UI' into develop
|
2025-11-21 17:07:01 +07:00 |
|
|
Tungdv
|
45ad9bc162
|
fix: Update logic select task in dlgnpc.
|
2025-11-21 17:03:39 +07:00 |
|
|
MinhHai
|
62482e5a9e
|
avoid Init EC_GameRun at EC_Game
|
2025-11-21 16:39:21 +07:00 |
|
|
anhld
|
07f7959605
|
Merge pull request 'matters' (#65) from feature/load-all-equipments into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/65
|
2025-11-21 09:20:49 +00:00 |
|
|
Le Duc Anh
|
f46b917dd8
|
fix the missing addressable objects
|
2025-11-21 16:18:19 +07:00 |
|
|
Le Duc Anh
|
95f2386397
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-21 16:04:56 +07:00 |
|
|
Le Duc Anh
|
30e636267c
|
udpate matter flow
|
2025-11-21 16:01:11 +07:00 |
|
|
NguyenVanDat
|
d80f7f4f07
|
Merge branch 'develop' into feature/refactor-game-run
|
2025-11-21 11:50:36 +07:00 |
|
|
NguyenVanDat
|
8f5673c68e
|
refactor game run and fix game flow
|
2025-11-21 11:48:39 +07:00 |
|
|
tungdv
|
18d6c308a7
|
Merge pull request 'Update logic interact dlgnpc.' (#64) from feature/hp_interact_npc into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/64
|
2025-11-21 04:46:20 +00:00 |
|
|
Tungdv
|
939b714ced
|
Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
# Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs
# Assets/PerfectWorld/Scripts/Task/TaskInterface.cs
# Assets/PerfectWorld/Scripts/Task/TaskProcess.cs
|
2025-11-21 11:45:16 +07:00 |
|
|
Tungdv
|
1951047c61
|
fix: update logic button back and close in dlgnpc.
|
2025-11-21 11:37:07 +07:00 |
|
|
MinhHai
|
0bcacf1599
|
Merge remote-tracking branch 'origin/develop' into implement_task_UI
|
2025-11-21 11:31:09 +07:00 |
|
|
MinhHai
|
e1bfd720e3
|
update logic receive Command.TASK_VER_DATA
|
2025-11-21 11:29:34 +07:00 |
|
|
Tungdv
|
17edc61e60
|
Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
# Assets/PerfectWorld/Scripts/Managers/EC_Inventory.cs
# Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommand.cs
# Assets/Scripts/CECHostPlayer.cs
|
2025-11-20 18:37:00 +07:00 |
|
|
Tungdv
|
ceec82ffc5
|
fix: update logic select option in dlgnpc.
|
2025-11-20 18:18:06 +07:00 |
|
|
Le Duc Anh
|
ca31090872
|
move all stuff into a61 scene
|
2025-11-20 15:33:30 +07:00 |
|
|
HungDK
|
a35cd6d0e7
|
Update EC_Invtr
|
2025-11-20 13:47:10 +07:00 |
|
|
hungdk
|
5dd011df46
|
Refactor and fixing ref
|
2025-11-20 02:18:48 +07:00 |
|
|
Tungdv
|
0324dc909e
|
fix: update logic select option dlg NPC.
|
2025-11-19 19:12:24 +07:00 |
|
|
Le Duc Anh
|
c2e8829c85
|
PC build
|
2025-11-19 16:15:03 +07:00 |
|
|
NguyenVanDat
|
02007bee50
|
add mutiplier player plugin
|
2025-11-19 15:10:12 +07:00 |
|
|
anhld
|
35ab182862
|
Merge pull request 'load npc/monster' (#63) from feature/load-all-equipments into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/63
|
2025-11-19 06:38:52 +00:00 |
|
|
Le Duc Anh
|
b400ad1e68
|
load npc/monster
|
2025-11-19 13:38:20 +07:00 |
|
|
NguyenVanDat
|
4e236c1c32
|
Merge branch 'develop' into bugfix/fix-character-animation
|
2025-11-19 11:51:34 +07:00 |
|
|
NguyenVanDat
|
e5fdb874c1
|
dummy change SelectGfx prefab
|
2025-11-19 11:50:23 +07:00 |
|
|
anhld
|
7c08a62912
|
Merge pull request 'disable default equipments' (#62) from feature/load-all-equipments into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/62
|
2025-11-19 04:04:57 +00:00 |
|
|
Le Duc Anh
|
b1fb758ce3
|
disable default equipments
|
2025-11-19 11:04:21 +07:00 |
|
|
NguyenVanDat
|
65b7e8b947
|
Merge branch 'develop' into bugfix/fix-character-animation
|
2025-11-19 10:44:08 +07:00 |
|
|
NguyenVanDat
|
e8a76c0c58
|
fix character animation config name
|
2025-11-19 10:42:24 +07:00 |
|
|
anhld
|
cddfdbe84f
|
Merge pull request 'restore text' (#61) from feature/load-all-equipments into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/61
|
2025-11-19 03:32:18 +00:00 |
|
|
Le Duc Anh
|
542780ed10
|
restore text
|
2025-11-19 10:31:25 +07:00 |
|
|
anhld
|
d2001c1d16
|
Merge pull request 'use default equipments for players' (#60) from feature/load-all-equipments into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/60
|
2025-11-18 15:27:31 +00:00 |
|
|
Le Duc Anh
|
f907e404c4
|
use default equipments if needed
|
2025-11-18 22:26:40 +07:00 |
|
|
Le Duc Anh
|
45024b5761
|
turn off default equipments if needed
|
2025-11-18 22:04:56 +07:00 |
|
|
Tungdv
|
bb28c8505d
|
fix: update logic select option in dlg npc.
|
2025-11-18 19:01:03 +07:00 |
|
|
Tungdv
|
6f3a509534
|
Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
# Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
|
2025-11-18 16:46:24 +07:00 |
|
|
Tungdv
|
4633e8278c
|
fix: update logic send cmd accept task.
|
2025-11-18 16:40:04 +07:00 |
|
|
anhld
|
60f1f2a686
|
Merge pull request 'c2s_CmdNPCSevAcceptTask' (#59) from feature/load-all-equipments into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/59
|
2025-11-18 09:37:12 +00:00 |
|
|
Le Duc Anh
|
ba1e532e6d
|
Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments
|
2025-11-18 16:36:32 +07:00 |
|
|
Le Duc Anh
|
3174cd28d1
|
send npc accept task cmd
|
2025-11-18 16:36:15 +07:00 |
|
|
tungdv
|
46052e60d2
|
Merge pull request 'Update logic init CECGameUIMan.' (#58) from feature/hp_interact_npc into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/58
|
2025-11-18 07:37:03 +00:00 |
|
|
Tungdv
|
c56542a347
|
Merge remote-tracking branch 'origin/implement_task_UI' into feature/hp_interact_npc
|
2025-11-18 14:34:58 +07:00 |
|
|
Tungdv
|
42845aef94
|
fix: update logic init CECGameUIMan.
|
2025-11-18 14:33:13 +07:00 |
|
|
MinhHai
|
c2cbd6919c
|
Merge remote-tracking branch 'origin/develop' into implement_task_UI
|
2025-11-18 14:20:16 +07:00 |
|
|
tungdv
|
2b709e5734
|
Merge pull request 'Add base UI manger and dlg manager' (#57) from feature/hp_interact_npc into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/57
|
2025-11-18 07:15:54 +00:00 |
|
|
Tungdv
|
2094f5d36d
|
Merge branch 'develop' into feature/hp_interact_npc
# Conflicts:
# Assets/PerfectWorld/Scripts/UI/Dialogs/DlgNPC.cs
|
2025-11-18 14:14:47 +07:00 |
|
|
Tungdv
|
c90e50eed9
|
feat: add base uimanger and dlg manager.
|
2025-11-18 14:10:29 +07:00 |
|