Commit Graph

  • cddfdbe84f Merge pull request 'restore text' (#61) from feature/load-all-equipments into develop anhld 2025-11-19 03:32:18 +00:00
  • 542780ed10 restore text Le Duc Anh 2025-11-19 10:31:25 +07:00
  • d2001c1d16 Merge pull request 'use default equipments for players' (#60) from feature/load-all-equipments into develop anhld 2025-11-18 15:27:31 +00:00
  • f907e404c4 use default equipments if needed Le Duc Anh 2025-11-18 22:26:40 +07:00
  • 45024b5761 turn off default equipments if needed Le Duc Anh 2025-11-18 22:04:56 +07:00
  • bb28c8505d fix: update logic select option in dlg npc. Tungdv 2025-11-18 19:01:03 +07:00
  • 8ee2477681 get config VDH 2025-11-18 18:54:56 +07:00
  • 6f3a509534 Merge branch 'develop' into feature/hp_interact_npc Tungdv 2025-11-18 16:46:24 +07:00
  • 4633e8278c fix: update logic send cmd accept task. Tungdv 2025-11-18 16:40:04 +07:00
  • 60f1f2a686 Merge pull request 'c2s_CmdNPCSevAcceptTask' (#59) from feature/load-all-equipments into develop anhld 2025-11-18 09:37:12 +00:00
  • ba1e532e6d Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments Le Duc Anh 2025-11-18 16:36:32 +07:00
  • 3174cd28d1 send npc accept task cmd Le Duc Anh 2025-11-18 16:36:15 +07:00
  • 46052e60d2 Merge pull request 'Update logic init CECGameUIMan.' (#58) from feature/hp_interact_npc into develop tungdv 2025-11-18 07:37:03 +00:00
  • c56542a347 Merge remote-tracking branch 'origin/implement_task_UI' into feature/hp_interact_npc Tungdv 2025-11-18 14:34:58 +07:00
  • 42845aef94 fix: update logic init CECGameUIMan. Tungdv 2025-11-18 14:33:13 +07:00
  • c2cbd6919c Merge remote-tracking branch 'origin/develop' into implement_task_UI MinhHai 2025-11-18 14:20:16 +07:00
  • 2b709e5734 Merge pull request 'Add base UI manger and dlg manager' (#57) from feature/hp_interact_npc into develop tungdv 2025-11-18 07:15:54 +00:00
  • 2094f5d36d Merge branch 'develop' into feature/hp_interact_npc Tungdv 2025-11-18 14:14:47 +07:00
  • c90e50eed9 feat: add base uimanger and dlg manager. Tungdv 2025-11-18 14:10:29 +07:00
  • 7610493367 Merge pull request 'Add all sword man armors. Load armor and weapon on game init.' (#56) from feature/load-all-equipments into develop anhld 2025-11-18 05:01:10 +00:00
  • de738b8f16 Merge branch 'feature/skillui' into feature/skill-data VDH 2025-11-18 09:44:10 +07:00
  • d992dcbc5f Merge remote-tracking branch 'origin/feature/hp_interact_npc_merge' into implement_task_UI MinhHai 2025-11-17 19:14:26 +07:00
  • 097b29b2cf Merge pull request 'fix: add logic hp_interact_npc' (#55) from feature/hp_interact_npc_merge into develop tungdv 2025-11-17 12:13:00 +00:00
  • fdb9ebed34 fix: update code for merge dev. Tungdv 2025-11-17 19:10:44 +07:00
  • af6a20f403 Add skill ui HungDK 2025-11-17 19:10:02 +07:00
  • 884a0274af fix Search Task feature MinhHai 2025-11-17 19:07:15 +07:00
  • 3826311391 Merge remote-tracking branch 'origin/develop' into implement_task_UI MinhHai 2025-11-17 19:06:35 +07:00
  • afa9f882a9 Merge branch 'develop' into feature/hp_interact_npc Tungdv 2025-11-17 19:06:14 +07:00
  • 86c304f43a fix: update logic select option dialog npc. Tungdv 2025-11-17 18:52:07 +07:00
  • e59127a425 catch message start and stop attack NguyenVanDat 2025-11-17 18:24:12 +07:00
  • 1d5025ab46 ui and flow gfx VDH 2025-11-17 18:04:31 +07:00
  • fa1bd3d076 Merge branch 'develop' into feature/hp_interact_npc Tungdv 2025-11-17 14:50:24 +07:00
  • 1325a8df63 fix: update logic select option interact npc. Tungdv 2025-11-17 14:31:20 +07:00
  • 39092a47d5 update logic search task MinhHai 2025-11-16 16:46:39 +07:00
  • a8ac3a1188 Merge remote-tracking branch 'origin/develop' into implement_task_UI MinhHai 2025-11-16 16:45:48 +07:00
  • 75e897d315 update visual for prefab UI MinhHai 2025-11-16 16:45:34 +07:00
  • e7d0da9bb9 load gfx done VDH 2025-11-15 17:33:10 +07:00
  • d2c9a12929 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments Le Duc Anh 2025-11-15 17:05:07 +07:00
  • 9f664ffd9f add all human male armor Le Duc Anh 2025-11-15 17:00:59 +07:00
  • 16fadfe2a4 fix play animation NguyenVanDat 2025-11-15 13:54:29 +07:00
  • f86cce30e9 11/14 VDH 2025-11-14 19:03:42 +07:00
  • 7798c1a909 show npc name on UI MinhHai 2025-11-14 18:08:46 +07:00
  • faaa843ef3 play animation with fade time NguyenVanDat 2025-11-14 16:05:52 +07:00
  • 690a8dd9de Merge branch 'develop' into feature/skill-data VDH 2025-11-14 11:32:54 +07:00
  • ba0ed76ab7 convert processing VDH 2025-11-14 10:37:08 +07:00
  • 5eb6670b80 fix loop animation NguyenVanDat 2025-11-14 09:51:35 +07:00
  • 621c833793 11/13 VDH 2025-11-13 18:57:24 +07:00
  • e46fcf2ee5 fix: update show text mission in dlgnpc. Tungdv 2025-11-13 18:14:49 +07:00
  • fe73a9b979 handle conflict feature/add-vfx NguyenVanDat 2025-11-13 17:53:31 +07:00
  • f7d0ee6b43 Merge branch 'develop' into feature/add-vfx NguyenVanDat 2025-11-13 17:22:47 +07:00
  • c6f24993b5 show selecting vfx and elase player enter vfx NguyenVanDat 2025-11-13 17:12:41 +07:00
  • 2de7d597b2 Merge pull request 'feature/load-all-equipments' (#54) from feature/load-all-equipments into develop anhld 2025-11-13 09:44:25 +00:00
  • ba9c97d3f6 fix the conflicts Le Duc Anh 2025-11-13 16:43:59 +07:00
  • 648d51ff3a Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments Le Duc Anh 2025-11-13 16:22:36 +07:00
  • c4a56218d8 load player model Le Duc Anh 2025-11-13 16:12:12 +07:00
  • 4315a318d4 new character and weapon prefabs Le Duc Anh 2025-11-13 09:31:26 +07:00
  • f067943ca5 Merge branch 'develop' into feature/add-vfx NguyenVanDat 2025-11-13 09:24:47 +07:00
  • ba784b7f77 add standalone TASK_CLIENT NguyenVanDat 2025-11-13 09:24:19 +07:00
  • daeabf3aca Merge remote-tracking branch 'origin/develop' into feature/add-vfx NguyenVanDat 2025-11-13 09:13:15 +07:00
  • 2534e3f6c5 add task test NguyenVanDat 2025-11-13 09:12:38 +07:00
  • 8bf8f3716c fix: update text dlgnpc and fix bug merge. tung.do@monkey.edu.vn 2025-11-13 01:51:06 +07:00
  • 9feb2b22e3 Merge branch 'develop' into feature/hp_interact_npc Tungdv 2025-11-12 19:39:19 +07:00
  • 28efdb79ec update hover vfx NguyenVanDat 2025-11-12 18:27:46 +07:00
  • 62575718f6 server cast skill player processing VDH 2025-11-12 17:59:50 +07:00
  • 020058d9da fix: update logic show dialog NPC. Tungdv 2025-11-12 17:20:15 +07:00
  • 271bb0d787 fix conflict MinhHai 2025-11-12 17:14:39 +07:00
  • bb01bbb6f1 Merge remote-tracking branch 'origin/develop' into implement_task_UI MinhHai 2025-11-12 16:57:45 +07:00
  • 2c3c44de4e update Task: complete read task templ, log task name and description on UI, add sprites asset MinhHai 2025-11-12 16:56:35 +07:00
  • 58ae3d64b2 add partial of CECGameRun: Task MinhHai 2025-11-12 16:52:28 +07:00
  • 752d2cd69e fix player don't play stand animation when cast skill VDH 2025-11-12 15:24:36 +07:00
  • f1e15cdc2d apply final level up vfx NguyenVanDat 2025-11-12 14:05:00 +07:00
  • 4918b77070 Merge pull request 'feature/add-vfx' (#53) from feature/add-vfx into develop datnv 2025-11-12 04:07:52 +00:00
  • cfeebf3a15 Merge branch 'develop' into feature/add-vfx NguyenVanDat 2025-11-12 11:04:43 +07:00
  • 142fabf108 Merge branch 'develop' into feature/add-vfx NguyenVanDat 2025-11-12 11:03:25 +07:00
  • fb2288c2a2 Merge pull request 'skill 1,2,3,4,5,6' (#52) from feature/skill-data into develop hoangvd 2025-11-12 03:53:35 +00:00
  • 6d98f3d30f skill 1,2,3,4,5,6 VDH 2025-11-12 10:52:37 +07:00
  • b3bac397e4 Merge pull request 'develop' (#51) from develop into feature/load-all-equipments anhld 2025-11-12 03:23:37 +00:00
  • d3bd3f7403 remove not use code NguyenVanDat 2025-11-12 10:23:33 +07:00
  • 629d419c57 WIP logic show vfx select target and level up NguyenVanDat 2025-11-12 10:21:09 +07:00
  • 875b9ad866 add vfx NguyenVanDat 2025-11-12 10:17:44 +07:00
  • ea53c30306 Merge branch 'feature/mall' into develop HungDK 2025-11-12 09:27:12 +07:00
  • fabb286473 fix: update logic show dialog npc. Tungdv 2025-11-11 19:04:49 +07:00
  • 451555a1ba Merge remote-tracking branch 'origin/develop' into implement_task_UI MinhHai 2025-11-11 18:35:33 +07:00
  • 115a7d5991 Merge pull request 'done skill' (#50) from feature/skill-data into develop hoangvd 2025-11-11 10:14:26 +00:00
  • ecbdf4c803 done skill VDH 2025-11-11 17:12:51 +07:00
  • 9d8e219f3c Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments Le Duc Anh 2025-11-11 15:59:38 +07:00
  • 9be43da2ae load equipment skin Le Duc Anh 2025-11-11 15:59:26 +07:00
  • a236ee0506 Merge pull request 'ref' (#49) from feature/skill-data into develop hoangvd 2025-11-11 07:14:17 +00:00
  • e01c923e16 ref VDH 2025-11-11 14:13:14 +07:00
  • 936d3d5e7a Merge pull request 'feature/skill-data' (#48) from feature/skill-data into develop hoangvd 2025-11-11 06:45:26 +00:00
  • a13e931bc1 fix bug after merge VDH 2025-11-11 13:44:55 +07:00
  • 40f17dadab Merge remote-tracking branch 'origin/develop' into feature/skill-data VDH 2025-11-11 13:44:45 +07:00
  • cbf626fa28 skill processing VDH 2025-11-11 13:33:27 +07:00
  • 2974373390 Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments Le Duc Anh 2025-11-11 10:30:06 +07:00
  • ec4bb785b8 fix: update logic show dialog. Tungdv 2025-11-10 19:50:39 +07:00
  • b7bf20be75 show selecting vfx NguyenVanDat 2025-11-10 18:24:09 +07:00
  • f58d00a4ac Update shop categories HungDK 2025-11-10 16:13:31 +07:00
  • b287ff7902 Fix scroll HungDK 2025-11-10 10:52:21 +07:00
  • 32d0aeff3a Fix unexpect item order in each tab of mall HungDK 2025-11-10 10:52:05 +07:00
  • f643998dda ifx: update logic show dialog npc. Tungdv 2025-11-08 18:51:00 +07:00