1260 Commits

Author SHA1 Message Date
kawagiri
246d9c9f6e Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-11 01:03:26 +08:00
kawagiri
b6833d6945 V0.7.0 2026-04-11 01:03:23 +08:00
daixiawu
19762a5f73 heroHintPanel 2026-04-11 00:25:09 +08:00
kawagiri
8f93d63d87 yuugibug修复 2026-04-10 23:31:35 +08:00
kawagiri
9ae097d05e Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1
# Conflicts:
#	Unity/Assets/Scripts/TH1_Logic/Skill/AllSkill/YuugiPushSkill.cs
2026-04-10 21:12:52 +08:00
kawagiri
f2a979ffdf 图鉴+英雄任务 2026-04-10 21:11:05 +08:00
kawagiri
e6d6debd74 yuugi技能+图鉴 2026-04-10 21:10:54 +08:00
8040ee52f3 限制非英雄杀死才生成骨堆 2026-04-10 18:42:53 +08:00
1ecf826c86 骨堆血量 2026-04-10 18:37:49 +08:00
6a63df8447 修改技能 2026-04-10 18:35:50 +08:00
cd0ab9c4ee Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 into main 2026-04-10 18:17:32 +08:00
c666a7fe4c 修复技能 2026-04-10 18:17:28 +08:00
daixiawu
fe34ea0da0 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-10 18:16:10 +08:00
daixiawu
c39c70a96b 修复AI不生产英雄的bug,优化hintUI 2026-04-10 18:16:06 +08:00
1b077b20b0 修复技能 2026-04-10 17:38:26 +08:00
kawagiri
174f9b2e08 阿空技能更新 2026-04-10 17:31:20 +08:00
kawagiri
1785d78666 技能修复 2026-04-10 17:20:45 +08:00
kawagiri
28a9518e07 修复英雄技能 2026-04-10 16:43:26 +08:00
kawagiri
1e62e3d20e 修复英雄文化值Bug 2026-04-10 14:26:55 +08:00
kawagiri
6782947122 恋恋技能调整 2026-04-10 14:09:56 +08:00
kawagiri
64eeac779a Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-10 14:03:49 +08:00
kawagiri
2215015f4a 恋恋技能修改,地图生成逻辑修改 2026-04-10 14:03:46 +08:00
daixiawu
4b28e6b460 恋恋技能 2026-04-10 14:03:25 +08:00
daixiawu
9b88bae353 法典效果 2026-04-10 13:56:36 +08:00
kawagiri
5bf6b45c12 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-10 13:55:13 +08:00
kawagiri
9f96cc855f 优化英雄bug 2026-04-10 13:55:05 +08:00
daixiawu
543e44da7b Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1
# Conflicts:
#	Unity/Assets/Scripts/TH1_Data/PlayerData.cs
#	Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoHeroPickedRowMono.cs
2026-04-10 13:54:53 +08:00
daixiawu
5bfc01acef 法典效果实现 2026-04-10 13:54:25 +08:00
kawagiri
f631ea9647 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-10 13:29:53 +08:00
kawagiri
599e8824c5 英雄等级批量调整 2026-04-10 13:29:50 +08:00
daixiawu
f70a6ea985 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-10 13:03:51 +08:00
daixiawu
d103c3fdc7 修复法典逻辑 2026-04-10 13:03:46 +08:00
kawagiri
f4b6059176 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-10 12:24:22 +08:00
kawagiri
5f601fef7f Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-10 12:23:59 +08:00
kawagiri
14755bc316 修复herohintpanel 2026-04-10 12:23:41 +08:00
daixiawu
e97557e182 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1
# Conflicts:
#	Tools/MultilingualTxt.txt
#	Unity/Assets/Resources/DataAssets/UnitTypeDataAssets.asset
#	Unity/Assets/Resources/Export/Multilingual.asset
#	Unity/Assets/Resources/Prefab/UI/Hint/HeroHintPanel.prefab
2026-04-10 12:23:29 +08:00
daixiawu
11ea43babf 修复法典相关逻辑 2026-04-10 12:22:45 +08:00
62d92872b2 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 into main 2026-04-10 11:33:26 +08:00
d09769a1f2 修改moment的二级和三级英雄 2026-04-10 11:33:24 +08:00
kawagiri
6913c464bd 法典系统更新 2026-04-10 10:24:20 +08:00
kawagiri
d7a9825515 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1
# Conflicts:
#	Unity/Assets/Resources/Prefab/UI/Hint/HeroHintPanel.prefab
2026-04-10 00:20:13 +08:00
kawagiri
5dea5e54f4 修正逻辑 2026-04-10 00:19:52 +08:00
daixiawu
41011b801d unit新增enableAction 2026-04-10 00:18:09 +08:00
daixiawu
a025f34368 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-09 23:38:06 +08:00
kawagiri
2ca6e2c82e Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1
# Conflicts:
#	Unity/Assets/Scripts/TH1_UI/View/Outside/UIOutsideSelectView.cs
2026-04-09 23:13:57 +08:00
kawagiri
6730329f0c 新增技能调整 2026-04-09 23:12:21 +08:00
daixiawu
4ce09d8dd5 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-09 20:08:50 +08:00
daixiawu
c6758b2a6c 提示系统优化 2026-04-09 20:08:47 +08:00
9092b181a6 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 into main 2026-04-09 19:09:06 +08:00
5fd0907617 骨堆生命值逻辑 2026-04-09 19:09:03 +08:00