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

96 Commits

Author SHA1 Message Date
VDH ef366cfc32 convert skill combo' 2026-01-22 19:23:32 +07:00
VDH 1cdeb28367 Merge branch 'develop' into feature/skill-set-shortcut 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs
#	Assets/PerfectWorld/Scripts/Skills/ElementSkill.cs
#	Assets/Scripts/CECHostPlayer.cs
 2026-01-21 17:51:54 +07:00
VDH 53190f3f61 convert skill bombo 2026-01-21 17:40:10 +07:00
Chomper9981 e903de108a Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2026-01-20 16:32:36 +07:00
Chomper9981 273f353ddc add more item detail in inventory. Create some place holder for pet item so that those item can be shown 2026-01-20 16:31:57 +07:00
VDH 1d43192fb1 Merge branch 'develop' into feature/skill-data 
# Conflicts:
#	Assets/Scripts/CECHostPlayer.cs
 2026-01-19 16:22:53 +07:00
Chomper9981 093c257f74 Load more ItemType 2026-01-19 16:16:51 +07:00
VDH 1d03572b73 done learned skill UI 2026-01-19 16:15:17 +07:00
Tungdv 8b951d7f49 fix: 
- update loop anim
- update time count in cmd cache.
 2026-01-17 13:41:28 +07:00
Tungdv 15f9bd2a86 Merge branch 'develop' into feature/hp_swim 
# Conflicts:
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/Scripts/CECHostPlayer.cs
 2026-01-16 19:16:40 +07:00
Tungdv 0b23be64a2 fix: update logic cmd cache. 2026-01-16 18:02:39 +07:00
Chomper9981 e37fbefad4 Add Suite ("Noi dung bo trang bi") to show with item in inventory. Rename some Variant that have confuse name in hostplayer. 2026-01-16 13:35:51 +07:00
Tungdv 017d26b64f feat: add command cache. 2026-01-15 19:22:30 +07:00
Chomper9981 22bf1bddcb add armor dialog for quest "chao hoi" 2026-01-12 15:52:09 +07:00
Chomper9981 a9157bac7c Merge branch 'develop' into update-in-game 2026-01-12 10:03:39 +07:00
Chomper9981 4c7217929d Complete add feature "Load weapon data" and show it in the "Quest Chao Hoi Lay Item" 2026-01-08 15:02:20 +07:00
VDH 81eb5720fc skill ui progressing 2026-01-07 14:45:32 +07:00
Chomper9981 b00af6cb70 add some data to UI 2025-12-30 17:32:22 +07:00
Chomper9981 7909a09617 Merge branch 'develop' of https://git.brew.monster/Unity/perfect-world-unity into update-in-game 2025-12-30 10:21:49 +07:00
Chomper9981 e504a077c1 Add itemdataman basic 2025-12-30 10:19:18 +07:00
VDH cc1f4a9556 ui skill for tesst 2025-12-29 17:32:48 +07:00
HungDK 325e1e25b6 Update Addressable manager 2025-12-25 16:41:11 +07:00
Le Duc Anh c0541f562d use Stream instead of FileStream 2025-12-25 10:50:39 +07:00
Le Duc Anh ba30b37c06 #if UNITY_EDITOR 2025-12-24 18:05:54 +07:00
VDH 76e66cafdb debug 2025-12-23 14:19:04 +07:00
VDH 80c40705d2 skill pos processing 2025-12-05 21:07:25 +07:00
VDH 5c42c9792b test buff skill 2025-12-02 16:46:47 +07:00
VDH 8f8e7f010c continue with bless skill 2025-12-02 13:50:44 +07:00
Le Duc Anh 466e39d67c Merge remote-tracking branch 'origin/develop' into feature/load-all-equipments 2025-11-24 14:27:45 +07:00
VDH 3450fd015f Merge branch 'develop' into feature/skill-data 
# Conflicts:
#	Assets/PerfectWorld/Config.meta
#	Assets/PerfectWorld/Editor.meta
#	Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
#	Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
#	Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
#	Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
#	Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/CSNetwork.csproj.meta
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/Scenes/NPCRender.unity
#	Assets/Scenes/a61.unity
#	Assets/Scripts/CECGameRun.cs
#	Assets/Scripts/CECHostPlayer.Task.cs
#	Assets/Scripts/CECHostPlayer.cs
#	Assets/Scripts/CECPlayer_Inventory.cs
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
 2025-11-24 10:16:07 +07:00
Le Duc Anh edff7723d8 Load the elementdata for Android 2025-11-21 23:22:07 +07:00
Tungdv 9129784de0 Merge branch 'develop' into feature/hp_interact_npc 2025-11-21 17:07:50 +07:00
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