Commit Graph

150 Commits

Author SHA1 Message Date
Tourswen
d0327ec47b Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW 2025-07-30 11:58:57 +08:00
Tourswen
afbf73a0fe 2025-7-30 2025-07-30 11:58:52 +08:00
Tourswen
1d0f098ac2 2025-7-29 2025-07-29 23:47:25 +08:00
ProjectKoi-Kalo\Kalo
313a57df0b 暂存控制台 2025-07-29 18:26:56 +08:00
ProjectKoi-Kalo\Kalo
6b5d9166e7 暂存 2025-07-29 18:08:39 +08:00
ProjectKoi-Kalo\Kalo
6c3ab94d6c Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW
# Conflicts:
#	Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo
2025-07-29 17:24:29 +08:00
ProjectKoi-Kalo\Kalo
24dcdea1e8 检查特质再崩溃 2025-07-29 17:23:20 +08:00
Tourswen
d3deb335c2 2025-7-28 2025-07-28 00:23:59 +08:00
Tourswen
a96b0c4065 2025-7-27 2025-07-27 20:57:13 +08:00
ProjectKoi-Kalo\Kalo
49d58a83cb 暂存5 2025-07-27 17:23:35 +08:00
ProjectKoi-Kalo\Kalo
821d7fdac4 暂存事件6 2025-07-27 17:17:54 +08:00
ProjectKoi-Kalo\Kalo
0ed7bb14d1 暂存4 2025-07-27 17:02:34 +08:00
ProjectKoi-Kalo\Kalo
502edf03a0 暂存3 2025-07-27 16:45:42 +08:00
ProjectKoi-Kalo\Kalo
5d1181ef97 Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW 2025-07-27 16:20:44 +08:00
ProjectKoi-Kalo\Kalo
93389f6b30 暂存2 2025-07-27 16:20:39 +08:00
ProjectKoi-Kalo\Kalo
d84068d6b7 暂存 2025-07-27 15:59:44 +08:00
Tourswen
adba9cd904 2025-7-27 2025-07-27 05:16:31 +08:00
ProjectKoi-Kalo\Kalo
83422aaea8 反常子个体 2025-07-25 23:11:42 +08:00
Tourswen
a33d616d23 2025-7-25 2025-07-25 19:10:16 +08:00
Tourswen
a77088e3c7 2025-7-25 2025-07-25 17:31:09 +08:00
Tourswen
ebe768cda5 2025-7-25 2025-07-25 12:02:42 +08:00
Tourswen
0c09c14f17 2025-7-25 2025-07-25 00:12:07 +08:00
Tourswen
4806992462 2025-7-24 2025-07-24 20:50:48 +08:00
Tourswen
1b11362c96 2025-7-24 2025-07-24 17:59:10 +08:00
ProjectKoi-Kalo\Kalo
b6fb9dfd4c 兴趣度训练器 2025-07-24 14:14:58 +08:00
ProjectKoi-Kalo\Kalo
a02373059d 普通的修理包 2025-07-24 13:49:45 +08:00
ProjectKoi-Kalo\Kalo
979eded2db Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW 2025-07-24 12:03:47 +08:00
ProjectKoi-Kalo\Kalo
21b9ec45f6 修医生抢喂食工作 2025-07-24 12:02:34 +08:00
Tourswen
cb431428ce Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW 2025-07-24 11:50:06 +08:00
Tourswen
ee02e89353 2025-7-24 2025-07-24 11:49:43 +08:00
ProjectKoi-Kalo\Kalo
f4d6f35185 Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW 2025-07-24 11:44:07 +08:00
ProjectKoi-Kalo\Kalo
2a9ab3eec5 暂存修送囚犯能量 2025-07-24 11:44:04 +08:00
Tourswen
c25b33fa75 2025-7-24 2025-07-24 10:48:38 +08:00
ProjectKoi-Kalo\Kalo
5af0d5e81f 补推送 2025-07-24 02:51:12 +08:00
ProjectKoi-Kalo\Kalo
8fafcd6b1d Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW
# Conflicts:
#	1.6/Assemblies/WulaFallenEmpire.dll
#	Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo
2025-07-24 02:50:03 +08:00
ProjectKoi-Kalo\Kalo
98234950db 暂存 2025-07-24 02:49:44 +08:00
ProjectKoi-Kalo\Kalo
4fa18bb22e 囚犯乌拉也要吃饭问题 2025-07-24 02:07:38 +08:00
Tourswen
afed374045 2025-7-24 2025-07-24 01:25:47 +08:00
ProjectKoi-Kalo\Kalo
db4d08e4bd 有一点自私的护盾 2025-07-23 18:50:51 +08:00
ProjectKoi-Kalo\Kalo
6414a2a033 Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW 2025-07-23 16:54:14 +08:00
ProjectKoi-Kalo\Kalo
588fff3cdd 能量核心2补 2025-07-23 16:54:03 +08:00
Tourswen
cab0958514 2025-7-23 2025-07-23 15:45:21 +08:00
Tourswen
596e4b596b 2025-7-23 2025-07-23 12:02:54 +08:00
Tourswen
94b772b919 Update Races_Wulaspecies.xml 2025-07-22 23:33:34 +08:00
Tourswen
cb19a54b26 2025-7-22 2025-07-22 23:33:30 +08:00
ProjectKoi-Kalo\Kalo
0dcebba343 hediff能量 2025-07-22 19:31:18 +08:00
ProjectKoi-Kalo\Kalo
15494e8a8e 暂存 2025-07-22 19:07:21 +08:00
ProjectKoi-Kalo\Kalo
4f524845a9 补暂存 2025-07-22 16:36:01 +08:00
ProjectKoi-Kalo\Kalo
94a099c774 暂存 2025-07-21 20:36:58 +08:00
ProjectKoi-Kalo\Kalo
0f24b38d71 乌拉自己找吃的 2025-07-21 19:01:33 +08:00
ProjectKoi-Kalo\Kalo
885d2f7ad7 Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW 2025-07-21 16:25:07 +08:00
ProjectKoi-Kalo\Kalo
d1e20383e4 麻了先暂存 2025-07-21 16:24:04 +08:00
Tourswen
a720501e7f 2025-7-21 2025-07-21 15:45:33 +08:00
ProjectKoi-Kalo\Kalo
2c8166b832 存一下 2025-07-21 13:45:52 +08:00
ProjectKoi-Kalo\Kalo
b8f3fc5bcd 添加爆炸射线武器系统 2025-07-21 12:33:45 +08:00
ProjectKoi-Kalo\Kalo
416492ed35 Merge branch 'main' of https://git.ra3battle.cn/Kalospacer/WulaFallenEmpireRW
# Conflicts:
#	1.6/Defs/HediffDefs/Implants_RegenerateBackstory.xml
2025-07-21 11:46:18 +08:00
Tourswen
7388d09443 2025-7-21 2025-07-21 11:37:01 +08:00
ProjectKoi-Kalo\Kalo
8af86740a5 修merge错误 2025-07-21 02:34:00 +08:00
ProjectKoi-Kalo\Kalo
7fef90ef64 Merge branch 'main' of https://github.com/Tourswen/WulaFallenEmpireRW 2025-07-21 02:27:51 +08:00
ProjectKoi-Kalo\Kalo
369c5aef11 技能训练器 2025-07-21 02:26:25 +08:00
Tourswen
289ef78e91 2025-7-21 2025-07-21 02:21:03 +08:00
ProjectKoi-Kalo\Kalo
ef074ec366 暂存能量改动 2025-07-21 02:05:37 +08:00
Tourswen
857600afa8 2025-7-20 2025-07-20 22:22:31 +08:00
Tourswen
f5b964fd17 2025-7-20 2025-07-20 17:53:41 +08:00
Tourswen
eed1c1b46a 2025-7-20 2025-07-20 15:49:38 +08:00
Tourswen
c0ae920226 2025-7-20 2025-07-20 15:47:43 +08:00
ProjectKoi-Kalo\Kalo
974b7642e1 暂存 2025-07-19 15:29:01 +08:00
ProjectKoi-Kalo\Kalo
ddc2065d7d Merge branch 'main' of https://github.com/Tourswen/WulaFallenEmpireRW 2025-07-19 15:27:29 +08:00
ProjectKoi-Kalo\Kalo
0691cd2e64 zc 2025-07-19 15:19:08 +08:00
ProjectKoi-Kalo\Kalo
f76198814f 2025-07-19 13:01:13 +08:00
ProjectKoi-Kalo\Kalo
0cd5fc91a8 Merge branch 'main' of https://github.com/Tourswen/WulaFallenEmpireRW 2025-07-19 12:49:35 +08:00
ProjectKoi-Kalo\Kalo
82a98e8d69 Merge branch 'main' of https://github.com/Tourswen/WulaFallenEmpireRW
# Conflicts:
#	Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/.suo
#	Source/WulaFallenEmpire/.vs/WulaFallenEmpire/v17/DocumentLayout.json
#	Source/WulaFallenEmpire/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
#	Source/WulaFallenEmpire/obj/Debug/WulaFallenEmpire.csproj.AssemblyReference.cache
2025-07-19 12:09:10 +08:00
ProjectKoi-Kalo\Kalo
1b7491a7ee 暂存修 2025-07-19 12:04:57 +08:00
Tourswen
c2279eddd0 2025-7-19 2025-07-19 12:00:31 +08:00
Tourswen
88183d4df6 2025-7-19 2025-07-19 10:13:37 +08:00
Tourswen
d609517019 2025-7-19 2025-07-19 10:11:10 +08:00
ProjectKoi-Kalo\Kalo
afa7a1a726 Merge branch 'main' of https://github.com/Tourswen/WulaFallenEmpireRW 2025-07-18 21:56:38 +08:00
ProjectKoi-Kalo\Kalo
8239b56c33 机械师和背景hediff未验证 2025-07-18 21:45:44 +08:00
Tourswen
c8cbd7e06e 2025-7-18 2025-07-18 19:43:12 +08:00
Tourswen
d390323c2d 2025-7-18 2025-07-18 18:26:50 +08:00
Tourswen
18f702e701 2025-7-18 2025-07-18 17:26:43 +08:00
Tourswen
e0b6c1fb0f 2025-7-17 2025-07-17 17:46:38 +08:00
Tourswen
d39c8d4fc9 2025-7-17 2025-07-17 12:00:08 +08:00
ProjectKoi-Kalo\Kalo
0da481b223 改一下斜角墙路径 2025-07-17 11:24:49 +08:00
ProjectKoi-Kalo\Kalo
33cdaf3108 Merge branch 'main' of https://github.com/Tourswen/WulaFallenEmpireRW
# Conflicts:
#	1.6/Defs/PawnKinds/PawnKinds_Wula.xml
#	Source/WulaFallenEmpire/Building_Wula_DarkEnergy_Engine.cs
#	Textures/Wula/Things/WULA_Assault_Cat/WULA_Cat_Thin_south.sai2
2025-07-17 11:20:23 +08:00
Tourswen
5c65c85ec4 2025-7-17 2025-07-17 11:17:40 +08:00
ProjectKoi-Kalo\Kalo
a2b732362b 斜角墙 2025-07-17 11:11:40 +08:00
Tourswen
bfed80d452 2025-7-17 2025-07-17 00:10:05 +08:00
Tourswen
ec55082fc0 2025-7-16 2025-07-16 17:24:10 +08:00
Tourswen
2493d6a845 2025-7-16 2025-07-16 12:54:17 +08:00
Tourswen
56cd37e0a8 2025-7-16 2025-07-16 11:59:32 +08:00
Tourswen
96c44b4c6a 2025-7-16 2025-07-16 00:59:16 +08:00
Tourswen
16ec93b99d 2025-7-15 2025-07-15 17:29:39 +08:00
Tourswen
1054ee2768 Update WULA_Floor.png 2025-07-15 12:31:04 +08:00
Tourswen
0b722cd292 2025-7-15 2025-07-15 12:04:02 +08:00
Tourswen
403587cd63 2025-7-14 2025-07-14 23:16:42 +08:00
Tourswen
b424217f7b Update Buildings_WULA.xml 2025-07-14 11:58:43 +08:00
Tourswen
9f95777891 2025-7-14 2025-07-14 03:47:48 +08:00
Tourswen
b0f3ea1b10 2025-7-13 2025-07-13 23:15:51 +08:00
Tourswen
7fab43df3b 2025-7-12 2025-07-12 11:53:19 +08:00