duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,000 Commits 13 Branches 0 Tags
develop
Commit Graph

164 Commits

Author SHA1 Message Date
Tungdv 45ad9bc162 fix: Update logic select task in dlgnpc. 2025-11-21 17:03:39 +07:00
VDH c37ec4d136 Push hoang current work 2025-11-21 10:18:08 +07:00
Le Duc Anh c2e8829c85 PC build 2025-11-19 16:15:03 +07:00
anhld 7610493367 Merge pull request 'Add all sword man armors. Load armor and weapon on game init.' (#56) from feature/load-all-equipments into develop 
Reviewed-on: https://git.brew.monster/Unity/perfect-world-unity/pulls/56
 2025-11-18 05:01:10 +00:00
Le Duc Anh 9f664ffd9f add all human male armor 2025-11-15 17:00:59 +07:00
Tungdv 9feb2b22e3 Merge branch 'develop' into feature/hp_interact_npc 
# Conflicts:
#	Assets/PerfectWorld/Scripts/GameData/ExpTypes.cs
#	Assets/PerfectWorld/Scripts/MainFiles/CECGameRun.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECUIManager.cs
 2025-11-12 19:39:19 +07:00
Tungdv 020058d9da fix: update logic show dialog NPC. 2025-11-12 17:20:15 +07:00
Tungdv fabb286473 fix: update logic show dialog npc. 2025-11-11 19:04:49 +07:00
MinhHai 451555a1ba Merge remote-tracking branch 'origin/develop' into implement_task_UI 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
 2025-11-11 18:35:33 +07:00
Tungdv f643998dda ifx: update logic show dialog npc. 2025-11-08 18:51:00 +07:00
VDH d4af8e33f9 convert for test done 2025-11-07 18:01:47 +07:00
Tungdv 3bd29134b9 fix: update dialog NPC. 2025-11-06 18:58:05 +07:00
VDH 38a2c0d46f covnert continue 2025-11-06 17:29:02 +07:00
VDH 0ad91a5e1d InitAllSkillsOfCurProf done 2025-11-05 17:55:50 +07:00
MinhHai 64c2fc234a create task window 2025-11-04 17:39:06 +07:00
VDH eaf1a4ba2d Merge remote-tracking branch 'origin/develop' into feature/skill-data 
# Conflicts:
#	.idea/.idea.perfect-world-unity/.idea/workspace.xml
#	Assets/AddressableAssetsData.meta
#	Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset
#	Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta
#	Assets/AddressableAssetsData/AssetGroupTemplates.meta
#	Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
#	Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta
#	Assets/AddressableAssetsData/AssetGroups.meta
#	Assets/AddressableAssetsData/AssetGroups/Schemas.meta
#	Assets/AddressableAssetsData/AssetGroups/Schemas/models_BundledAssetGroupSchema.asset
#	Assets/AddressableAssetsData/AssetGroups/Schemas/models_BundledAssetGroupSchema.asset.meta
#	Assets/AddressableAssetsData/AssetGroups/Schemas/models_ContentUpdateGroupSchema.asset
#	Assets/AddressableAssetsData/AssetGroups/Schemas/models_ContentUpdateGroupSchema.asset.meta
#	Assets/AddressableAssetsData/AssetGroups/models.asset
#	Assets/AddressableAssetsData/AssetGroups/models.asset.meta
#	Assets/AddressableAssetsData/DataBuilders.meta
#	Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta
#	Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta
#	Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta
#	Assets/AddressableAssetsData/DefaultObject.asset
#	Assets/AddressableAssetsData/DefaultObject.asset.meta
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECHostPlayer.cs
 2025-11-04 15:29:57 +07:00
MinhHai c9cd71c3f9 Merge branch 'develop' into feature/convert-task-templ 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Task/ATaskTemplFixedData.cs
#	Assets/PerfectWorld/Scripts/Task/ATaskTemplFixedData.cs.meta
#	Assets/PerfectWorld/Scripts/Task/AWARD_DATA.cs
#	Assets/PerfectWorld/Scripts/Task/AWARD_DATA.cs.meta
#	Assets/PerfectWorld/Scripts/Task/AWARD_ITEMS_CAND.cs
#	Assets/PerfectWorld/Scripts/Task/AWARD_ITEMS_CAND.cs.meta
#	Assets/PerfectWorld/Scripts/Task/SizeTest.cs
#	Assets/PerfectWorld/Scripts/Task/SizeTest.cs.meta
#	Assets/PerfectWorld/Scripts/Task/TaskExpAnalyser.cs
#	Assets/PerfectWorld/Scripts/Task/TaskLog.txt
#	Assets/PerfectWorld/Scripts/Task/TaskLog.txt.meta
#	Assets/Scenes/HoangTest.unity
 2025-11-03 17:30:47 +07:00
MinhHai e21fbc4021 complete read properties of Task 2025-11-03 17:26:34 +07:00
NguyenVanDat 4316661cb2 skill convert processing 2025-10-31 17:50:04 +07:00
NguyenVanDat d72d4cd967 Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 
# Conflicts:
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
 2025-10-27 13:41:59 +07:00
HungDK a2469d0259 Merge branch 'develop' into feature/inventories 2025-10-27 10:33:38 +07:00
VDH 7c88068369 npc server name 2025-10-24 10:18:56 +07:00
VDH c0d4478b38 name npc 2025-10-23 17:33:12 +07:00
HungDK d293f2ab52 Update EC_StringTab.cs 2025-10-23 10:52:24 +07:00
Le Duc Anh 9fa1c93e27 addressable intial commit 2025-10-22 16:34:56 +07:00
HungDK bad4451ffc Add textfomatter to apply color, drop down 2025-10-21 16:55:22 +07:00
HungDK 9d5545199d Merge branch 'develop' into feature/inventory 2025-10-18 14:45:23 +07:00
HungDK e9c69ab511 Add buy cmd 2025-10-17 17:53:34 +07:00
HungDK 94e3ba12b3 Add load icon, image, detail 2025-10-16 17:49:30 +07:00
VDH 432004b5b4 npcdie 2025-10-16 09:10:20 +07:00
VDH dce34489ed Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang 2025-10-14 17:13:58 +07:00
VDH 4f06139b2e fix bug animation wound npc 2025-10-14 14:57:19 +07:00
HungDK 0389950579 Merge branch 'develop' into feature/inventory 2025-10-14 11:17:32 +07:00
HungDK b0b2201e72 Add globaldataman 2025-10-14 10:53:03 +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
VDH bcba39d951 reset 2025-10-11 10:02:52 +07:00
Le Duc Anh 2b7ad0e335 add get id data type function 2025-10-11 09:50:36 +07: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
VDH c71e943ab7 Merge remote-tracking branch 'origin/develop' into feature/movement 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Common/CECObject.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/Scripts/Move/CECHostMove.cs
 2025-10-09 11:31:55 +07:00
VDH f0dca5bbdb npcAttack 2025-10-08 18:05:19 +07:00
Tungdv ee618bc38e fix: update attack normal. 2025-10-07 18:13:30 +07:00
NguyenVanDat 7ebb4c602f Merge remote-tracking branch 'origin/develop' into feature/movement 
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
#	Assets/Scripts/Move/EC_Player.cs
#	Assets/Scripts/PlayerVisual.cs
 2025-10-07 09:31:01 +07:00
Le Duc Anh 62c7417c74 change Logger to BMLogger 2025-10-01 15:14:38 +07:00
VDH 586e2f834b npc animtion processing 2025-09-27 17:10:53 +07:00
VDH 7640efa9d7 Merge remote-tracking branch 'origin/develop' into feature/movement 
# Conflicts:
#	Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
 2025-09-26 11:30:32 +07:00
NguyenVanDat ee1fb53efc handle confloct elementdataman 2025-09-26 09:19:18 +07:00
VDH 78152af05d npc Process 2025-09-25 17:38:33 +07:00