kawagiri/TH1
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity
1,622 Commits 10 Branches 9 Tags
Commit Graph

1285 Commits

Author SHA1 Message Date
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
wuwenbo
62d92872b2 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 into main 2026-04-10 11:33:26 +08:00
wuwenbo
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
wuwenbo
9092b181a6 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 into main 2026-04-09 19:09:06 +08:00
wuwenbo
5fd0907617 骨堆生命值逻辑 2026-04-09 19:09:03 +08:00
daixiawu
4d9bd1f6ed Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-09 19:03:41 +08:00
daixiawu
615530b96b hint模块优化 2026-04-09 19:03:38 +08:00
wuwenbo
65b77e373b 多语言相关补充 2026-04-09 19:03:09 +08:00
wuwenbo
11a8e1a88b 多语言相关 2026-04-09 18:59:43 +08:00
wuwenbo
c14f516a77 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 into main 2026-04-09 17:19:22 +08:00
wuwenbo
4f819e35a0 新增五个英雄AI 2026-04-09 17:18:53 +08:00
daixiawu
9208aafce1 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-09 11:26:28 +08:00
daixiawu
e65b63eb39 地图生成更新 2026-04-09 11:22:40 +08:00
kawagiri
6c87253a0d 阿空动画 2026-04-09 11:22:14 +08:00
kawagiri
53e7bc8060 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-09 11:02:27 +08:00
daixiawu
89b490125a Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-08 22:15:16 +08:00
daixiawu
9cef5d2439 自定义模式 2026-04-08 22:15:13 +08:00
kawagiri
70e6a793b4 自定义模式+阿空技能修复 2026-04-08 22:06:51 +08:00
kawagiri
62ad1a51af Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 2026-04-08 20:27:48 +08:00
kawagiri
8141357514 更新了灵乌路空的技能 2026-04-08 20:27:44 +08:00
wuwenbo
a5d1196110 多语言批量替换 2026-04-08 20:24:45 +08:00
wuwenbo
18ca8ab140 icon问题和技能 2026-04-08 20:15:08 +08:00
wuwenbo
9bb0f3d102 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 into main 2026-04-08 15:42:24 +08:00
wuwenbo
85c6229052 夺舍修复，icon入版，moment新增，steam隐私问题加了接口 2026-04-08 15:42:19 +08:00
kawagiri
1984f82a36 市政卡相关设计 2026-04-08 15:41:55 +08:00
kawagiri
267ab0baf1 文化值系统处理 2026-04-08 12:03:33 +08:00
kawagiri
c6bc3980c4 地灵殿普通单位新增 美术资源新增 2026-04-06 23:36:26 +08:00
wuwenbo
f6e7b91f83 Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 into main 2026-04-03 18:47:14 +08:00
wuwenbo
eccc97efc3 表情编辑器相关 2026-04-03 18:47:09 +08:00
kawagiri
df839d316e emoji资源上传 2026-04-03 17:19:58 +08:00