Commit Graph

274 Commits

Author SHA1 Message Date
NguyenVanDat 664f114e53 log 2025-10-14 17:10:18 +07:00
HungDK 06957a037c Remove duplicate component 2025-10-14 11:46:58 +07:00
HungDK 929913003a Fix merge conflix 2025-10-14 11:24:10 +07:00
HungDK c62b05d10e Update CECHostPlayer.cs 2025-10-14 11:17:46 +07:00
HungDK 0389950579 Merge branch 'develop' into feature/inventory 2025-10-14 11:17:32 +07:00
HungDK 3695dd2262 Add gshop data 2025-10-14 10:53:35 +07:00
HungDK 190b2f522e Add GShopLoader 2025-10-14 10:53:16 +07:00
HungDK b0b2201e72 Add globaldataman 2025-10-14 10:53:03 +07:00
HungDK f31db71ef1 Update InventoryUI.prefab 2025-10-14 10:52:14 +07:00
HungDK b3db7998ae Update GPDataType.cs 2025-10-14 10:51:52 +07:00
HungDK a591d0b868 Fix data type wrong convert 2025-10-14 10:51:36 +07:00
HungDK 1ed01cd4c5 Clear useless log 2025-10-14 10:51:11 +07:00
Le Duc Anh 258798ebde save username password to player prefs 2025-10-14 10:43:04 +07:00
Le Duc Anh 5199df61f0 fix decompress algorithm 2025-10-14 10:35:43 +07:00
Le Duc Anh 3674ffba43 ecgame to normal class 2025-10-14 10:00:34 +07:00
hoangvd dd850b8578 Merge pull request 'feature/HostAttack_Hoang' (#26) from feature/HostAttack_Hoang into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/26
2025-10-13 11:13:33 +00:00
VDH 7b73223b55 npc get animation wound and text damage 2025-10-13 18:11:35 +07:00
VDH 7bc5c65229 animation attack done 2025-10-13 16:58:06 +07:00
VDH 4a701aaa16 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/Scripts/CECHostPlayer.cs
2025-10-13 09:11:16 +07:00
VDH bd344fcff5 player animation 2025-10-11 16:09:00 +07:00
Le Duc Anh 9cb287b58f Merge branch 'develop' of https://git.brew.monster/anhld/perfect-world-unity into develop 2025-10-11 15:57:47 +07:00
Le Duc Anh 142611dddd StringTab 2025-10-11 15:57:15 +07:00
tungdv d69c331fac Merge pull request 'fix bug send data hp_normal_attack to server' (#25) from feature/hp_normal_attack into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/25
2025-10-11 08:54:11 +00:00
Tungdv 955ba80dff Merge branch 'develop' into feature/hp_normal_attack 2025-10-11 15:53:46 +07:00
Tungdv 442035c587 fix: fix bug send data attack normal to server. 2025-10-11 15:52:12 +07:00
Tungdv d00efc44a8 fix: fix bug data send from server. 2025-10-11 11:46:16 +07:00
VDH 042b248368 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts:
#	Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs.meta
#	Assets/PerfectWorld/Scripts/Move/EC_Player.cs
#	Assets/PerfectWorld/Scripts/Move/EC_Player.cs.meta
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/Move/CECPlayer.cs
2025-10-11 10:09:59 +07:00
VDH dd38edcdd5 change name file 2025-10-11 10:08:24 +07:00
VDH bcba39d951 reset 2025-10-11 10:02:52 +07:00
Le Duc Anh fab1fd0534 fix data type size 2025-10-11 09:56:30 +07:00
Le Duc Anh 2b7ad0e335 add get id data type function 2025-10-11 09:50:36 +07:00
Tungdv 3af8d968f1 fix: Update atk normal. 2025-10-10 19:02:57 +07:00
VDH a7666f9aa1 organize folder 2025-10-10 15:10:36 +07:00
VDH 3de4b27bb9 fixx 2025-10-09 18:32:18 +07:00
VDH 7d1dd88ff3 Merge branch 'feature/movement' into develop 2025-10-09 18:27:54 +07:00
VDH 24d080f210 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into develop 2025-10-09 18:27:47 +07:00
VDH febe6f8b00 st 2025-10-09 18:23:53 +07:00
hoangvd d5a07077c7 Merge pull request 'push again' (#24) from feature/movement into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/24
2025-10-09 11:18:29 +00:00
VDH 68643caa61 push again 2025-10-09 18:17:58 +07:00
VDH bd384699dc st 2025-10-09 18:16:02 +07:00
hoangvd 34a9a7f1e4 Merge pull request 'revert 439722a8c43fca9b6bd0bc24f313fbc4033af753' (#23) from hoangvd-patch-1 into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/23
2025-10-09 11:10:56 +00:00
hoangvd 38a12bd3fa revert 439722a8c4
revert Merge pull request 'feature/movement' (#22) from feature/movement into develop

Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/22

mất package
2025-10-09 11:06:44 +00:00
hoangvd 439722a8c4 Merge pull request 'feature/movement' (#22) from feature/movement into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/22
2025-10-09 10:08:03 +00:00
VDH 0f8823504f mer 2025-10-09 17:07:11 +07:00
HungDK f3d3a883dc Add matter spawn range 2025-10-09 17:04:29 +07:00
HungDK 7a000797ec Update place holder item drop object 2025-10-09 17:04:07 +07:00
HungDK 8286c01879 Remove useless code 2025-10-09 17:01:12 +07:00
VDH c961eea8e6 Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts:
#	Assets/PerfectWorld/Scripts/Managers/EC_HPWorkMelee.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
2025-10-09 17:00:48 +07:00
tungdv e7e8bef0f1 Merge pull request 'Update hp_normal_attack' (#21) from feature/hp_normal_attack into develop
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/21
2025-10-09 09:58:08 +00:00
Tungdv 56933f36d5 Merge branch 'develop' into feature/hp_normal_attack 2025-10-09 16:57:24 +07:00