This commit is contained in:
daixiawu 2026-06-27 02:30:03 +08:00
parent cdf251ebc4
commit 85a8484437
28 changed files with 85169 additions and 337 deletions

View File

@ -1,5 +1,5 @@
{
"nextId": 389,
"nextId": 390,
"bugs": [
{
"id": 2,
@ -3981,6 +3981,17 @@
"longTerm": false,
"createdAt": 1782453603577,
"updatedAt": 1782477154605
},
{
"id": 389,
"title": "貓: 06-27 01:55:23 发群里了 你上线可以看一下 不只是吞巨人 是城市升级奖励不生效 包括选文化也不生效 貓: 06-27 02:00:11 原因试出来了 是我占领城市的同时这个城市有一个升级奖励没有领取 或者我占领的同时 导致这个城市升级了",
"description": "",
"status": "open",
"priority": "medium",
"module": "",
"longTerm": false,
"createdAt": 1782497313208,
"updatedAt": 1782497313208
}
]
}

View File

@ -47,9 +47,9 @@ $unionFile = Read-RepoText "Unity/Assets/Scripts/TH1_Logic/Skill/Generate/SkillB
$expectedKasenSkillHex = @{
1 = "02000000030000004d010000"
2 = "02000000030000004d01000052010000"
3 = "02000000030000004d0100005201000053010000"
4 = "02000000030000004d010000520100005301000055010000"
2 = "02000000030000004d0100005201000059010000"
3 = "02000000030000004d010000520100005901000053010000"
4 = "02000000030000004d0100005201000059010000530100002701000055010000"
}
foreach ($level in 1..4) {
@ -59,7 +59,14 @@ foreach ($level in 1..4) {
if ($row.Success) {
$expected = $expectedKasenSkillHex[$level]
Assert-True ($row.Value -match [regex]::Escape("Skills: $expected")) "Kasen level $level has unexpected skill hex."
Assert-True ($row.Value -notmatch "25010000|27010000") "Kasen level $level still references old beast-guide/oni-form skill hex."
$forbiddenSkillHex = if ($level -eq 4) { "25010000" } else { "25010000|27010000" }
Assert-True ($row.Value -notmatch $forbiddenSkillHex) "Kasen level $level still references forbidden old skill hex."
if ($level -lt 4) {
Assert-True ($row.Value -notmatch "55010000") "KasenPermanentBerserk must only be on Kasen level 4."
}
if ($level -eq 4) {
Assert-True ($row.Value -notmatch "3c010000") "Kasen level 4 must use KasenPermanentBerserk, not temporary Berserk."
}
}
}
@ -73,6 +80,7 @@ $expectedSkillTypes = @{
339 = "KasenBeastGuideLv3Display"
340 = "KasenBeastGuideBerserkBuff"
341 = "KasenPermanentBerserk"
345 = "KasenBeastGuideTeleportDisplay"
}
foreach ($entry in $expectedSkillTypes.GetEnumerator()) {
@ -80,7 +88,13 @@ foreach ($entry in $expectedSkillTypes.GetEnumerator()) {
$row = [regex]::Match($skillAsset, "(?s)- SkillType: $($entry.Key)\b.*?(?=\r?\n - SkillType:|\r?\n SkillViewTypeColorList:)")
Assert-True $row.Success "Missing SkillDataAssets row for SkillType $($entry.Key)."
if ($row.Success) {
Assert-True ($row.Value -match "ShowOnUnitMono:\s+0") "SkillType $($entry.Key) must not show on UnitMono."
if ($entry.Key -eq 341) {
Assert-True ($row.Value -match "NotShow:\s+0") "KasenPermanentBerserk must show in the unit skill list."
Assert-True ($row.Value -match "ShowOnUnitMono:\s+1") "KasenPermanentBerserk must show on UnitMono."
}
else {
Assert-True ($row.Value -match "ShowOnUnitMono:\s+0") "SkillType $($entry.Key) must not show on UnitMono."
}
}
}
@ -94,6 +108,7 @@ $expectedUnions = @{
329 = "KasenBeastGuideLv3DisplaySkill"
330 = "KasenBeastGuideBerserkBuffSkill"
331 = "KasenPermanentBerserkSkill"
333 = "KasenBeastGuideTeleportDisplaySkill"
}
foreach ($entry in $expectedUnions.GetEnumerator()) {
@ -111,9 +126,13 @@ Assert-True ($actionAsset -match "(?s)UnitActionType:\s+46.*?ActionName: ""\\u6E
Assert-True ($gridAsset -match "GridSpType:\s+6") "GridAndResourceDataAssets must define GridSpType 6 sprite data."
$gridData = Read-RepoText "Unity/Assets/Scripts/TH1_Data/GridData.cs"
$mapData = Read-RepoText "Unity/Assets/Scripts/TH1_Data/MapData.cs"
$unitLogic = Read-RepoText "Unity/Assets/Scripts/TH1_Logic/Unit/UnitLogic.cs"
$gridObjectDataAssets = Read-RepoText "Unity/Assets/Scripts/TH1_DataAssetsScript/GridObjectDataAssets.cs"
$gridRenderer = Read-RepoText "Unity/Assets/Scripts/TH1_Renderer/GridRenderer.cs"
Assert-True ($gridData -match "KasenBeastGuide") "GridData must define KasenBeastGuide GridSpType."
Assert-True ($mapData -match "NormalizeKasenPermanentBerserkSkill") "MapData must normalize Kasen Lv4 permanent berserk."
Assert-True ($unitLogic -match "SkillType\.KasenPermanentBerserk") "UnitLogic must include KasenPermanentBerserk in berserk damage calculation."
Assert-True ($gridObjectDataAssets -match "GridSpType\.KasenBeastGuide") "GridObjectDataAssets must resolve the Kasen beast-guide sprite."
Assert-True ($gridRenderer -match "GridSpType\.KasenBeastGuide") "GridRenderer must keep the special tile layer visible for Kasen beast guide."

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 386 KiB

After

Width:  |  Height:  |  Size: 385 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 438 KiB

After

Width:  |  Height:  |  Size: 432 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 406 KiB

After

Width:  |  Height:  |  Size: 404 KiB

View File

@ -46,8 +46,8 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
alignment: 9
spritePivot: {x: 0.5, y: 0.4}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1

View File

@ -702,7 +702,7 @@ MonoBehaviour:
UnitFullTypes: []
TargetBuff:
- taskContentType: 24
Param: 4
Param: 5
SkillParam: 0
SpType: 0
SkillList:
@ -711,7 +711,7 @@ MonoBehaviour:
UnitFullTypes: []
TargetBuff:
- taskContentType: 24
Param: 8
Param: 10
SkillParam: 0
SpType: 0
SkillList:
@ -732,22 +732,22 @@ MonoBehaviour:
Desc: "\u7D2F\u8BA1\u63A2\u7D22**<{param}/{param}>**\u5757\u8FF7\u96FE\u533A\u57DF"
UnitFullTypes: []
TargetBuff:
- taskContentType: 23
Param: 60
SkillParam: 0
- taskContentType: 8
Param: 5
SkillParam: 335
SpType: 0
SkillList:
SkillName:
Desc: "\u7D2F\u8BA1\u9020\u6210\u6216\u627F\u53D7**<{param}/{param}>**\u70B9\u4F24\u5BB3"
Desc: "\u7D2F\u8BA1\u65BD\u52A0**<{param}/{param}>**\u6B21**<{param}>**"
UnitFullTypes: []
TargetBuff:
- taskContentType: 23
Param: 120
SkillParam: 0
- taskContentType: 8
Param: 10
SkillParam: 335
SpType: 0
SkillList:
SkillName:
Desc: "\u7D2F\u8BA1\u9020\u6210\u6216\u627F\u53D7**<{param}/{param}>**\u70B9\u4F24\u5BB3"
Desc: "\u7D2F\u8BA1\u65BD\u52A0**<{param}/{param}>**\u6B21**<{param}>**"
UnitFullTypes: []
TargetBuff:
- GiantType: 24

View File

@ -1493,7 +1493,7 @@ MonoBehaviour:
- SkillType: 111
SkillViewType: 2
SkillName: "\u94F6\u4E4B\u8DF3\u8DC3"
SkillDesc: "可以**<传送移动>**至任意**<己方英雄>**1格范围内并使**<1格范围内>**的**<己方英雄>**获得**<女仆长护佑>**。同回合内多次使用会累计层数。每次**<银之跳跃>**都会叠加与当前层数相同的**<疲劳>**"
SkillDesc: "\u53EF\u4EE5**<\u4F20\u9001\u79FB\u52A8>**\u81F3\u4EFB\u610F**<\u5DF1\u65B9\u82F1\u96C4>**1\u683C\u8303\u56F4\u5185\uFF0C\u5E76\u4F7F**<1\u683C\u8303\u56F4\u5185>**\u7684**<\u5DF1\u65B9\u82F1\u96C4>**\u83B7\u5F97**<\u5973\u4EC6\u957F\u62A4\u4F51>**\u3002\u540C\u56DE\u5408\u5185\u591A\u6B21\u4F7F\u7528\u4F1A\u7D2F\u8BA1\u5C42\u6570\u3002\u6BCF\u6B21**<\u94F6\u4E4B\u8DF3\u8DC3>**\u90FD\u4F1A\u53E0\u52A0\u4E0E\u5F53\u524D\u5C42\u6570\u76F8\u540C\u7684**<\u75B2\u52B3>**"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: f5cb587a9626a694b885c473e6c3fe6d, type: 3}
@ -1521,7 +1521,7 @@ MonoBehaviour:
- SkillType: 113
SkillViewType: 2
SkillName: "\u54B2\u591C\u7684\u4E16\u754C"
SkillDesc: "咲夜击杀单位时,获得**<移动行动点>**并可以再次使用**<银之跳跃>**。"
SkillDesc: "\u54B2\u591C\u51FB\u6740\u5355\u4F4D\u65F6\uFF0C\u83B7\u5F97**<\u79FB\u52A8\u884C\u52A8\u70B9>**\u5E76\u53EF\u4EE5\u518D\u6B21\u4F7F\u7528**<\u94F6\u4E4B\u8DF3\u8DC3>**\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: dbf7a694fcc82734b9cccae0da91a35c, type: 3}
@ -1967,7 +1967,7 @@ MonoBehaviour:
- SkillType: 180
SkillViewType: 1
SkillName: "\u9AD8\u5929\u539F\u6025\u884C"
SkillDesc: "可以在任意我方**<城市中心>**和**<天狗酒馆>**间**<传送移动>**。只能在**<山脉>**之间移动。"
SkillDesc: "\u53EF\u4EE5\u5728\u4EFB\u610F\u6211\u65B9**<\u57CE\u5E02\u4E2D\u5FC3>**\u548C**<\u5929\u72D7\u9152\u9986>**\u95F4**<\u4F20\u9001\u79FB\u52A8>**\u3002\u53EA\u80FD\u5728**<\u5C71\u8109>**\u4E4B\u95F4\u79FB\u52A8\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: 8a0140bbadde3444d821374ce2874af5, type: 3}
@ -3493,8 +3493,8 @@ MonoBehaviour:
ReserveCommonTransform: 0
- SkillType: 265
SkillViewType: 0
SkillName: "资金窃取"
SkillDesc: "城市本回合可收入资金已被全部窃取"
SkillName: "\u8D44\u91D1\u7A83\u53D6"
SkillDesc: "\u57CE\u5E02\u672C\u56DE\u5408\u53EF\u6536\u5165\u8D44\u91D1\u5DF2\u88AB\u5168\u90E8\u7A83\u53D6"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 0}
@ -3760,7 +3760,7 @@ MonoBehaviour:
- SkillType: 288
SkillViewType: 2
SkillName: "\u6DF1\u79D8\u6295\u5C04"
SkillDesc: "**<主动移动>**或**<传送移动>**后可向不同地形发射**<灵异珠>**,随着等级增长(Lv1/Lv2/Lv3)可以发射**<挪威之珠>****<丹麦之珠>**以及**<英格兰之珠>**。可在**<灵异珠>**附近**<传送移动>**。"
SkillDesc: "**<\u4E3B\u52A8\u79FB\u52A8>**\u6216**<\u4F20\u9001\u79FB\u52A8>**\u540E\u53EF\u5411\u4E0D\u540C\u5730\u5F62\u53D1\u5C04**<\u7075\u5F02\u73E0>**\uFF0C\u968F\u7740\u7B49\u7EA7\u589E\u957F(Lv1/Lv2/Lv3)\u53EF\u4EE5\u53D1\u5C04**<\u632A\u5A01\u4E4B\u73E0>**\uFF0C**<\u4E39\u9EA6\u4E4B\u73E0>**\u4EE5\u53CA**<\u82F1\u683C\u5170\u4E4B\u73E0>**\u3002\u53EF\u5728**<\u7075\u5F02\u73E0>**\u9644\u8FD1**<\u4F20\u9001\u79FB\u52A8>**\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: 7c846219dc9d4435a2e756c7e6be0508, type: 3}
@ -3830,7 +3830,7 @@ MonoBehaviour:
- SkillType: 293
SkillViewType: 2
SkillName: "\u517D\u5F15"
SkillDesc: "\u8328\u6728\u534E\u6247\u8BBE\u7F6E\u4E0E\u56DE\u6536\u517D\u5F15\u7684\u6838\u5FC3\u6280\u80FD\u3002\u5168\u573A\u53EA\u4FDD\u7559\u4E00\u4E2A\u517D\u5F15\u3002"
SkillDesc: "**<\u8328\u6728\u534E\u6247>**\u4E3A\u5F15\u5BFC\u4F17\u4EBA\u518D\u6B21\u8BBE\u4E0B\u517D\u5F15\u3002\u968F\u7740**<\u8328\u6728\u534E\u6247>**\u7B49\u7EA7\u63D0\u5347\uFF0C\u80FD\u591F\u63D0\u4F9B**<\u9E70\u4E4B\u517D\u5F15>**\uFF0C**<\u864E\u4E4B\u517D\u5F15>**\uFF0C**<\u9F99\u4E4B\u517D\u5F15>**\u7B49\u4E0D\u540C\u6548\u679C\u3002**<\u53CB\u65B9\u5355\u4F4D>**\u53EF**<\u56DE\u6536\u517D\u5F15>**\u5E76\u83B7\u5F97**<\u79FB\u52A8\u884C\u52A8\u70B9>**\uFF1B\u654C\u65B9\u5355\u4F4D\u53EF**<\u6E05\u9664\u517D\u5F15>**\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: b66c5a54af964544aff1a07997fc3452, type: 3}
@ -3858,7 +3858,7 @@ MonoBehaviour:
- SkillType: 295
SkillViewType: 2
SkillName: "\u9B3C\u4E4B\u8155"
SkillDesc: "\u8328\u6728\u534E\u6247\u8FDB\u5165\u9B3C\u5F62\u6001\uFF0C\u83B7\u5F97\u72C2\u66B4\u5E76\u89E3\u9501\u653B\u51FB\u540E\u7684\u989D\u5916\u884C\u52A8\u3002"
SkillDesc: "**<\u8328\u6728\u534E\u6247>**\u8FDB\u5165\u9B3C\u5F62\u6001\uFF0C\u6218\u6597\u6570\u503C\u5927\u5E45\u63D0\u5347\uFF0C\u5E76\u59CB\u7EC8\u5904\u4E8E**<\u72C2\u66B4>**\u72B6\u6001\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: 14f84b1705064a139d85ef7d26453703, type: 3}
@ -3872,7 +3872,7 @@ MonoBehaviour:
- SkillType: 296
SkillViewType: 4
SkillName: "\u543D\u5F62\u77F3\u5B88"
SkillDesc: "获得额外防御,获得伤害减免(数额与**<英雄等级>**相同),无法反击,为附近友方提供额外防御(不包括**<高丽野阿吽>**)。**<主动移动>**或**<主动攻击>**后自动解除该状态。"
SkillDesc: "\u83B7\u5F97\u989D\u5916\u9632\u5FA1\uFF0C\u83B7\u5F97\u4F24\u5BB3\u51CF\u514D(\u6570\u989D\u4E0E**<\u82F1\u96C4\u7B49\u7EA7>**\u76F8\u540C)\uFF0C\u65E0\u6CD5\u53CD\u51FB\uFF0C\u4E3A\u9644\u8FD1\u53CB\u65B9\u63D0\u4F9B\u989D\u5916\u9632\u5FA1\uFF08\u4E0D\u5305\u62EC**<\u9AD8\u4E3D\u91CE\u963F\u543D>**\uFF09\u3002**<\u4E3B\u52A8\u79FB\u52A8>**\u6216**<\u4E3B\u52A8\u653B\u51FB>**\u540E\u81EA\u52A8\u89E3\u9664\u8BE5\u72B6\u6001\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: a994762e362347569aaac57eda527bbd, type: 3}
@ -4054,7 +4054,7 @@ MonoBehaviour:
- SkillType: 330
SkillViewType: 2
SkillName: "\u543D\u5F62\u77F3\u5B88"
SkillDesc: "可主动进入**<吽形石守>**;若回合结束时仍有行动点,会自动进入**<吽形石守>**。"
SkillDesc: "\u53EF\u4E3B\u52A8\u8FDB\u5165**<\u543D\u5F62\u77F3\u5B88>**\uFF1B\u82E5\u56DE\u5408\u7ED3\u675F\u65F6\u4ECD\u6709\u884C\u52A8\u70B9\uFF0C\u4F1A\u81EA\u52A8\u8FDB\u5165**<\u543D\u5F62\u77F3\u5B88>**\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: a994762e362347569aaac57eda527bbd, type: 3}
@ -4082,7 +4082,7 @@ MonoBehaviour:
- SkillType: 332
SkillViewType: 4
SkillName: "\u963F\u543D\u53C2\u9053"
SkillDesc: "位于陆地上的**<高丽野阿吽>**附近时,可**<传送移动>**到另一只陆地上的**<高丽野阿吽>**附近。"
SkillDesc: "\u4F4D\u4E8E\u9646\u5730\u4E0A\u7684**<\u9AD8\u4E3D\u91CE\u963F\u543D>**\u9644\u8FD1\u65F6\uFF0C\u53EF**<\u4F20\u9001\u79FB\u52A8>**\u5230\u53E6\u4E00\u53EA\u9646\u5730\u4E0A\u7684**<\u9AD8\u4E3D\u91CE\u963F\u543D>**\u9644\u8FD1\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: 4e8a40912d3d450c92996e337cad1067, type: 3}
@ -4193,8 +4193,8 @@ MonoBehaviour:
ReserveCommonTransform: 0
- SkillType: 312
SkillViewType: 1
SkillName: "拒付丹麦金"
SkillDesc: "近期因拒绝支付**<丹麦金>**而受到惩罚,被**<劫掠>**时承担双倍损失"
SkillName: "\u62D2\u4ED8\u4E39\u9EA6\u91D1"
SkillDesc: "\u8FD1\u671F\u56E0\u62D2\u7EDD\u652F\u4ED8**<\u4E39\u9EA6\u91D1>**\u800C\u53D7\u5230\u60E9\u7F5A\uFF0C\u88AB**<\u52AB\u63A0>**\u65F6\u627F\u62C5\u53CC\u500D\u635F\u5931"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 0}
@ -4306,7 +4306,7 @@ MonoBehaviour:
- SkillType: 320
SkillViewType: 1
SkillName: "\u6781\u5149\u884C\u6B4C"
SkillDesc: "**<主动移动>**时为周围1格内**<友方单位>**恢复2点生命周围1格内**<友方单位>**死亡时自身恢复5点生命。"
SkillDesc: "**<\u4E3B\u52A8\u79FB\u52A8>**\u65F6\u4E3A\u5468\u56F41\u683C\u5185**<\u53CB\u65B9\u5355\u4F4D>**\u6062\u590D2\u70B9\u751F\u547D\uFF1B\u5468\u56F41\u683C\u5185**<\u53CB\u65B9\u5355\u4F4D>**\u6B7B\u4EA1\u65F6\uFF0C\u81EA\u8EAB\u6062\u590D5\u70B9\u751F\u547D\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: c1262ff24c1847a3b0695c0471bfbdcf, type: 3}
@ -4348,7 +4348,7 @@ MonoBehaviour:
- SkillType: 333
SkillViewType: 2
SkillName: "\u98DE\u9E70\u4FE1\u6807"
SkillDesc: "**<主动移动>**后可消耗**<攻击行动点>**在4格内空地或**<友方单位>**脚下设置**<兽引>**。若场上已经存在**<兽引>**,则必须回收后方可再次设置。"
SkillDesc: "**<\u4E3B\u52A8\u79FB\u52A8>**\u540E\u53EF\u6D88\u8017**<\u653B\u51FB\u884C\u52A8\u70B9>**\u57284\u683C\u5185\u7A7A\u5730\u6216**<\u53CB\u65B9\u5355\u4F4D>**\u811A\u4E0B\u8BBE\u7F6E**<\u517D\u5F15>**\u3002\u82E5\u573A\u4E0A\u5DF2\u7ECF\u5B58\u5728**<\u517D\u5F15>**\uFF0C\u5219\u5FC5\u987B\u56DE\u6536\u540E\u65B9\u53EF\u518D\u6B21\u8BBE\u7F6E\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: d0b725c88ede411ca80da4eb9c72c2c1, type: 3}
@ -4362,7 +4362,7 @@ MonoBehaviour:
- SkillType: 334
SkillViewType: 4
SkillName: "\u4FE1\u6807\u5C31\u7EEA"
SkillDesc: "每回合首次**<主动移动>**后获得该状态,若尚有**<飞鹰信标>**,即可设置**<兽引>**。"
SkillDesc: "\u6BCF\u56DE\u5408\u9996\u6B21**<\u4E3B\u52A8\u79FB\u52A8>**\u540E\u83B7\u5F97\u8BE5\u72B6\u6001\uFF0C\u82E5\u5C1A\u6709**<\u98DE\u9E70\u4FE1\u6807>**\uFF0C\u5373\u53EF\u8BBE\u7F6E**<\u517D\u5F15>**\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: d0b725c88ede411ca80da4eb9c72c2c1, type: 3}
@ -4376,7 +4376,7 @@ MonoBehaviour:
- SkillType: 335
SkillViewType: 2
SkillName: "\u517D\u5F15"
SkillDesc: "**<茨木华扇>**为引导众人再次设下兽引。随着**<茨木华扇>**等级提升,能够提供**<鹰之兽引>****<虎之兽引>****<龙之兽引>**等不同效果。**<友方单位>**可**<回收兽引>**并获得**<移动行动点>**;敌方单位可**<清除兽引>**。"
SkillDesc: "**<\u8328\u6728\u534E\u6247>**\u4E3A\u5F15\u5BFC\u4F17\u4EBA\u518D\u6B21\u8BBE\u4E0B\u517D\u5F15\u3002\u968F\u7740**<\u8328\u6728\u534E\u6247>**\u7B49\u7EA7\u63D0\u5347\uFF0C\u80FD\u591F\u63D0\u4F9B**<\u9E70\u4E4B\u517D\u5F15>**\uFF0C**<\u864E\u4E4B\u517D\u5F15>**\uFF0C**<\u9F99\u4E4B\u517D\u5F15>**\u7B49\u4E0D\u540C\u6548\u679C\u3002**<\u53CB\u65B9\u5355\u4F4D>**\u53EF**<\u56DE\u6536\u517D\u5F15>**\u5E76\u83B7\u5F97**<\u79FB\u52A8\u884C\u52A8\u70B9>**\uFF1B\u654C\u65B9\u5355\u4F4D\u53EF**<\u6E05\u9664\u517D\u5F15>**\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: b66c5a54af964544aff1a07997fc3452, type: 3}
@ -4418,7 +4418,7 @@ MonoBehaviour:
- SkillType: 338
SkillViewType: 2
SkillName: "\u4E24\u95E8\u7684\u5F6D\u7956"
SkillDesc: "**<兽引>**额外获得**<虎之兽引>**效果,**<兽引>**周围1格内**<友方单位>**获得**<彭祖守势>**并且在回合开始时恢复2点**<生命值>**。回收**<兽引>**的单位额外恢复5点生命。"
SkillDesc: "**<\u517D\u5F15>**\u989D\u5916\u83B7\u5F97**<\u864E\u4E4B\u517D\u5F15>**\u6548\u679C\uFF0C**<\u517D\u5F15>**\u5468\u56F41\u683C\u5185**<\u53CB\u65B9\u5355\u4F4D>**\u83B7\u5F97**<\u5F6D\u7956\u5B88\u52BF>**\uFF0C\u5E76\u4E14\u5728\u56DE\u5408\u5F00\u59CB\u65F6\u6062\u590D2\u70B9**<\u751F\u547D\u503C>**\u3002\u56DE\u6536**<\u517D\u5F15>**\u7684\u5355\u4F4D\u989D\u5916\u6062\u590D5\u70B9\u751F\u547D\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: af2a7ef3d553488da4528a73bbf5a142, type: 3}
@ -4432,7 +4432,7 @@ MonoBehaviour:
- SkillType: 339
SkillViewType: 2
SkillName: "\u5DE8\u9F99\u4E4B\u5578"
SkillDesc: "**<兽引>**额外获得**<龙之兽引>**效果围1格内友方获得**<黄帝攻势>**。回收**<兽引>**的单位额外获得**<狂暴>**状态,持续至本回合结束。"
SkillDesc: "**<\u517D\u5F15>**\u989D\u5916\u83B7\u5F97**<\u9F99\u4E4B\u517D\u5F15>**\u6548\u679C\uFF0C\u56F41\u683C\u5185\u53CB\u65B9\u83B7\u5F97**<\u9EC4\u5E1D\u653B\u52BF>**\u3002\u56DE\u6536**<\u517D\u5F15>**\u7684\u5355\u4F4D\u989D\u5916\u83B7\u5F97**<\u72C2\u66B4>**\u72B6\u6001\uFF0C\u6301\u7EED\u81F3\u672C\u56DE\u5408\u7ED3\u675F\u3002"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: 921e78e6b23642af94919f83e8a6dc77, type: 3}
@ -4444,10 +4444,10 @@ MonoBehaviour:
ReserveGiantUpgrade: 1
ReserveCommonTransform: 1
- SkillType: 340
SkillViewType: 4
SkillViewType: 2
SkillName: "\u72C2\u66B4"
SkillDesc: "\u53D1\u8D77**<\u4E3B\u52A8\u653B\u51FB>**\u65F6\uFF0C\u89C6\u4E3A\u6EE1\u8840\u53C2\u4E0E\u4F24\u5BB3\u8BA1\u7B97\u3002"
NotShow: 1
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: 89ab3f77ed894b0c910d5b90627cc8e2, type: 3}
HasShowList: 0
@ -4461,8 +4461,8 @@ MonoBehaviour:
SkillViewType: 4
SkillName: "\u72C2\u66B4"
SkillDesc: "\u53D1\u8D77**<\u4E3B\u52A8\u653B\u51FB>**\u65F6\uFF0C\u89C6\u4E3A\u6EE1\u8840\u53C2\u4E0E\u4F24\u5BB3\u8BA1\u7B97\u3002"
NotShow: 1
ShowOnUnitMono: 0
NotShow: 0
ShowOnUnitMono: 1
SkillIcon: {fileID: 21300000, guid: 89ab3f77ed894b0c910d5b90627cc8e2, type: 3}
HasShowList: 0
SkillShowList: []
@ -4473,11 +4473,11 @@ MonoBehaviour:
ReserveCommonTransform: 1
- SkillType: 345
SkillViewType: 2
SkillName: "\u517D\u5F15\u4F20\u9001"
SkillDesc: "\u534E\u6247Lv.2\u8D77\uFF0C**<\u5DF1\u65B9\u82F1\u96C4>**\u53EF\u5728**<\u8328\u6728\u534E\u6247>**\u4E0E\u5176\u6240\u5C5E**<\u517D\u5F15>**\u4E4B\u95F4**<\u4F20\u9001\u79FB\u52A8>**\uFF1A\u4F4D\u4E8E\u534E\u6247\u5468\u56F41\u683C\u65F6\u53EF\u4F20\u9001\u5230**<\u517D\u5F15>**\uFF1B\u7AD9\u5728**<\u517D\u5F15>**\u4E0A\u65F6\u53EF\u4F20\u9001\u5230\u534E\u6247\u5468\u56F41\u683C\u3002"
SkillName: "\u98DE\u9E70\u5F15\u6E21"
SkillDesc: "\u4F4D\u4E8E**<\u8328\u6728\u534E\u6247>**\u8EAB\u8FB9\u7684**<\u5DF1\u65B9\u82F1\u96C4>**\u53EF**<\u4E3B\u52A8\u79FB\u52A8>**\u81F3**<\u517D\u5F15>**\u5730\u5757\uFF0C\u800C\u4F4D\u4E8E**<\u517D\u5F15>**\u5730\u5757\u4E0A\u7684**<\u5DF1\u65B9\u82F1\u96C4>**\u4E5F\u53EF\u4EE5**<\u4E3B\u52A8\u79FB\u52A8>**\u81F3\u8328\u6728\u534E\u6247\u8EAB\u8FB9"
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: b66c5a54af964544aff1a07997fc3452, type: 3}
SkillIcon: {fileID: 21300000, guid: c95a35d54d5c4efdb6faa158a918f268, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0

View File

@ -8582,19 +8582,19 @@ MonoBehaviour:
Desc: "**<\u76F8>**\u804C\u9636\u82F1\u96C4\u3002\u5E1D\u56FD\u7684\u72EC\u81C2\u4ED9\u4EBA\u3002\u5979\u5728\u517D\u5F15\u65C1\u7ACB\u4E0B\u8BAD\u8BEB\uFF0C\u5C06\u957F\u8239\u3001\u8A93\u7EA6\u4E0E\u738B\u6CD5\u6C47\u6210\u901A\u5F80\u80DC\u5229\u7684\u822A\u7EBF\uFF1B\u5373\u4F7F\u8D8A\u8FC7\u5317\u6D77\u98CE\u6D6A\uFF0C\u6563\u4E71\u7684\u8FDC\u5F81\u961F\u4E5F\u4F1A\u62E8\u5F00\u4E91\u96FE\uFF0C\u5FAA\u7740\u5979\u7684\u6307\u5F15\u627E\u56DE\u6B63\u786E\u7684\u65B9\u5411\u3002"
LandType: 5
NoMaxHealth: 0
MaxHealth: 45
Attack: 3
Defense: 3
MaxHealth: 50
Attack: 4
Defense: 4
MoveRange: 2
AttackRange: 2
AttackRange: 1
SightRange: 2
Cost: 0
Skills: 02000000030000004d01000052010000590100005301000055010000
Skills: 02000000030000004d0100005201000059010000530100002701000055010000
Sprite: {fileID: 21300000, guid: 9297ce7f343bed04fb59bc23c7ac076f, type: 3}
PetrifiedSprite: {fileID: 0}
IsSpriteVarient: 0
SpriteList: []
ProjectileType: 12
ProjectileType: 1
ForceMelee: 0
SameUnitCountLimit: 1
EnableAction: 0

View File

@ -12,8 +12,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c659b850b20e460f866ed3f696be406b, type: 3}
m_Name: VersionConfig
m_EditorClassIdentifier:
CurVersionId: 70405
CurVersionId: 70406
Versions:
- MajorVersion: 0
MinorVersion: 7
PatchVersion: 4
Description: "[\u7248\u672C V0.7.4g]\n\u53D1\u5E03\u65E5\u671F:26.6.27\n\n---------\u65B0\u5185\u5BB9\u4E0E\u8C03\u6574-------------\n1.\u535A\u4E3D\u5E1D\u56FD\u65B0\u589E\u53EF\u9009\u62E9\u82F1\u96C4\uFF1A\u8328\u6728\u534E\u6247\n\n---------bug\u4FEE\u590D\u4E0E\u4F18\u5316-------------\n1.\u5B8C\u5584\u4E86\u963F\u543D\u7684\u5404\u4E2A\u6280\u80FD\u63CF\u8FF0\n2.\u4FEE\u590D\u4E86\u654C\u65B9\u5355\u4F4D\u6B7B\u4EA1\u4E5F\u4F1A\u4F7F\u5F97\u5973\u6B66\u795E\u6062\u590D\u751F\u547D\u7684bug\uFF0C\u4FEE\u6B63\u4E86\u5973\u6B66\u795E\u80FD\u529B\u63CF\u8FF0\n3.\u4FEE\u590D\u4E86\u535A\u4E3D\u5E1D\u56FD\u8F6C\u5316\u5176\u4ED6\u5E1D\u56FD\u7684\u5DE8\u4EBA\u5355\u4F4D\u540E\uFF0C\u8BE5\u5355\u4F4D\u8FDB\u5165\u957F\u8239\u6E2F\u4E0D\u4F1A\u53D8\u4E3A\u5DE8\u4EBA\u6218\u8239\u7684bug\n4.\u4FEE\u590D\u4E86\u5B88\u77E2\u5E1D\u56FD\u53EF\u4EE5\u5C06\u654C\u65B9\u5C71\u8109\u89C6\u4F5C\u9053\u8DEF\u7684bug\n5.\u4FEE\u590D\u4E86\u516B\u5742\u795E\u5948\u5B50\u53EF\u4EE5\u4ECE\u654C\u65B9\u5C71\u8109\u5EFA\u7B51\u83B7\u5F97\u52A0\u6210\u7684bug\n6.\u4FEE\u590D\u4E86\u963F\u543D\u8FDB\u5165\u6E2F\u53E3\u540E\u76F8\u5173\u80FD\u529B\u51FA\u9519\u7684bug\uFF0C\u665A\u4E0A\u4E86\u5176\u80FD\u529B\u4E2D\u4E0E\u6E2F\u53E3\u76F8\u5173\u7684\u63CF\u8FF0\n7.\u4FEE\u590D\u4E86\u4F0A\u5439\u8403\u9999\u901A\u8FC7\u5927\u6C5F\u5C71\u6089\u7686\u6740\u5B8C\u6210\u79FB\u52A8\u65F6\u89C6\u91CE\u6CA1\u6709\u53CA\u65F6\u5237\u65B0\u7684bug"
FourthVersion: 6
- MajorVersion: 0
MinorVersion: 7
PatchVersion: 4

View File

@ -702,7 +702,7 @@ MonoBehaviour:
UnitFullTypes: []
TargetBuff:
- taskContentType: 24
Param: 4
Param: 5
SkillParam: 0
SpType: 0
SkillList:
@ -711,7 +711,7 @@ MonoBehaviour:
UnitFullTypes: []
TargetBuff:
- taskContentType: 24
Param: 8
Param: 10
SkillParam: 0
SpType: 0
SkillList:
@ -732,22 +732,22 @@ MonoBehaviour:
Desc: 2001
UnitFullTypes: []
TargetBuff:
- taskContentType: 23
Param: 60
SkillParam: 0
- taskContentType: 8
Param: 5
SkillParam: 335
SpType: 0
SkillList:
SkillName:
Desc: 21022
Desc: 1998
UnitFullTypes: []
TargetBuff:
- taskContentType: 23
Param: 120
SkillParam: 0
- taskContentType: 8
Param: 10
SkillParam: 335
SpType: 0
SkillList:
SkillName:
Desc: 21022
Desc: 1998
UnitFullTypes: []
TargetBuff:
- GiantType: 24

File diff suppressed because it is too large Load Diff

View File

@ -3825,7 +3825,7 @@ MonoBehaviour:
- SkillType: 293
SkillViewType: 2
SkillName: 21288
SkillDesc: 21289
SkillDesc: 22091
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: b66c5a54af964544aff1a07997fc3452, type: 3}
@ -3853,7 +3853,7 @@ MonoBehaviour:
- SkillType: 295
SkillViewType: 2
SkillName: 21493
SkillDesc: 21292
SkillDesc: 22096
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: 14f84b1705064a139d85ef7d26453703, type: 3}
@ -4439,10 +4439,10 @@ MonoBehaviour:
ReserveGiantUpgrade: 1
ReserveCommonTransform: 1
- SkillType: 340
SkillViewType: 4
SkillViewType: 2
SkillName: 21549
SkillDesc: 21626
NotShow: 1
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: 89ab3f77ed894b0c910d5b90627cc8e2, type: 3}
HasShowList: 0
@ -4466,6 +4466,20 @@ MonoBehaviour:
ReserveLeaveCarry: 1
ReserveGiantUpgrade: 1
ReserveCommonTransform: 1
- SkillType: 345
SkillViewType: 2
SkillName: 22094
SkillDesc: 22095
NotShow: 0
ShowOnUnitMono: 0
SkillIcon: {fileID: 21300000, guid: c95a35d54d5c4efdb6faa158a918f268, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0
ReserveOnCarry: 1
ReserveLeaveCarry: 1
ReserveGiantUpgrade: 1
ReserveCommonTransform: 1
SkillViewTypeColorList:
- SkillViewType: 0
Color: {r: 0.16078432, g: 0.16078432, b: 0.3647059, a: 1}

View File

@ -8533,7 +8533,7 @@ MonoBehaviour:
AttackRange: 1
SightRange: 2
Cost: 0
Skills: 02000000030000004d01000052010000
Skills: 02000000030000004d0100005201000059010000
Sprite: {fileID: 21300000, guid: c74d72e70b64494ca571bfdf1ff71b33, type: 3}
PetrifiedSprite: {fileID: 0}
IsSpriteVarient: 0
@ -8561,7 +8561,7 @@ MonoBehaviour:
AttackRange: 1
SightRange: 2
Cost: 0
Skills: 02000000030000004d0100005201000053010000
Skills: 02000000030000004d010000520100005901000053010000
Sprite: {fileID: 21300000, guid: c74d72e70b64494ca571bfdf1ff71b33, type: 3}
PetrifiedSprite: {fileID: 0}
IsSpriteVarient: 0
@ -8582,19 +8582,19 @@ MonoBehaviour:
Desc: 21849
LandType: 5
NoMaxHealth: 0
MaxHealth: 45
Attack: 3
Defense: 3
MaxHealth: 50
Attack: 4
Defense: 4
MoveRange: 2
AttackRange: 2
AttackRange: 1
SightRange: 2
Cost: 0
Skills: 02000000030000004d010000520100005301000055010000
Skills: 02000000030000004d0100005201000059010000530100002701000055010000
Sprite: {fileID: 21300000, guid: 9297ce7f343bed04fb59bc23c7ac076f, type: 3}
PetrifiedSprite: {fileID: 0}
IsSpriteVarient: 0
SpriteList: []
ProjectileType: 12
ProjectileType: 1
ForceMelee: 0
SameUnitCountLimit: 1
EnableAction: 0

View File

@ -12,8 +12,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c659b850b20e460f866ed3f696be406b, type: 3}
m_Name: VersionConfig
m_EditorClassIdentifier:
CurVersionId: 70405
CurVersionId: 70406
Versions:
- MajorVersion: 0
MinorVersion: 7
PatchVersion: 4
Description: 22097
FourthVersion: 6
- MajorVersion: 0
MinorVersion: 7
PatchVersion: 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

View File

@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: c95a35d54d5c4efdb6faa158a918f268
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 9c64893a7e4d4572b0884e73bf78440b
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -2060,6 +2060,22 @@ namespace RuntimeData
if (unit.GetSkill(info.AddSkillType, out var addedSkill))
addedSkill.OnSkillAdd(this, unit.Id);
}
NormalizeKasenPermanentBerserkSkill(unit);
}
public void NormalizeKasenPermanentBerserkSkill(UnitData unit)
{
if (unit == null || unit.UnitType != UnitType.Giant || unit.GiantType != GiantType.NorwayKasen ||
unit.UnitLevel < 4)
return;
if (unit.GetSkill(SkillType.Berserk, out _))
unit.RemoveSkill(SkillType.Berserk, this);
if (unit.GetSkill(SkillType.KasenPermanentBerserk, out _)) return;
unit.AddInitSkill(SkillType.KasenPermanentBerserk, this);
if (unit.GetSkill(SkillType.KasenPermanentBerserk, out var addedSkill))
addedSkill.OnSkillAdd(this, unit.Id);
}
// 移除小兵数据

View File

@ -61,6 +61,18 @@ public class SkillDataAssets : ScriptableObject
Init();
return _skillDict.TryGetValue(skill,out skillInfo);
}
public static bool ShouldShowOnUnitMono(SkillType skill, SkillInfo skillInfo)
{
if (skillInfo == null) return false;
return skillInfo.ShowOnUnitMono || skill == SkillType.KasenPermanentBerserk;
}
public static bool ShouldShowInUnitSkillList(SkillType skill, SkillInfo skillInfo)
{
if (skillInfo == null) return false;
return !skillInfo.NotShow || skill == SkillType.KasenPermanentBerserk;
}
//根据unitTypeKey决定skill显示为什么
public bool GetSkillNameAndDesc_DECODE(SkillType skill,UnitFullType key,SkillBase skillparam,out String skillName, out String skillDesc)
{
@ -231,4 +243,4 @@ public class SkillInfoShowPack
public string SkillDesc;
[MultilingualField]
public string SkillName;
}
}

View File

@ -669,6 +669,7 @@ namespace Logic.Skill
kasen.RemoveSkill(SkillType.KasenBeastGuideReady, map);
kasen.ClearActionPoint();
RefreshKasenBeastGuideStatBuffs(map);
kasen.HeroTask(map)?.OnSkillActivation(map, SkillType.KasenBeastGuideGrid, 1);
if (map == Main.MapData)
{
@ -691,9 +692,9 @@ namespace Logic.Skill
Main.UnitLogic.RecoverHealth_Legacy(map, actor, actor, KasenBeastGuideRecallHeal);
if (ownerLevel >= 3)
{
actor.AddSkill_Legacy(SkillType.KasenBeastGuideBerserkBuff, map, false, 0, false, -1, false,
actor.AddSkill_Legacy(SkillType.Berserk, map, false, 0, false, -1, false,
SpecialAddSkillType.Force, guideSkill.KasenOriginId);
PlaySkillIcon(map, actor, SkillType.KasenBeastGuideBerserkBuff);
PlaySkillIcon(map, actor, SkillType.Berserk);
}
actor.Renderer(map)?.InstantUpdateUnit(false);
return true;

View File

@ -2168,6 +2168,8 @@ namespace Logic
if (!unitData.IsAlive())
return;
mapData.NormalizeKasenPermanentBerserkSkill(unitData);
if (unitData.HasEffectiveSkill(SkillType.Item, out _))
{
unitData.ActionPoint.Clear();
@ -2335,7 +2337,8 @@ namespace Logic
newSkill?.NewSkillOnTransform(unitData.SkillCache);
}
}
mapData.NormalizeKasenPermanentBerserkSkill(unitData);
var originFullType = originFullTypeBeforeTransform;
var targetFullType = targetFullTypeBeforeTransform;

View File

@ -177,7 +177,7 @@ namespace TH1_Renderer
if (skill == null) continue;
var skillType = skill.GetSkillType();
if (!Table.Instance.SkillDataAssets.GetSkillInfo(skillType, out var skillInfo)) continue;
if (skillInfo.ShowOnUnitMono)
if (SkillDataAssets.ShouldShowOnUnitMono(skillType, skillInfo))
{
showSkills.Add(skillType);
}
@ -185,7 +185,7 @@ namespace TH1_Renderer
if (HakureiNorwayHeroSkillUtil.HasAunnPetrifiedDefenseAuraState(Main.MapData, unitData)
&& Table.Instance.SkillDataAssets.GetSkillInfo(SkillType.AunnPetrifiedDefenseAura, out var aunnAuraInfo)
&& aunnAuraInfo.ShowOnUnitMono)
&& SkillDataAssets.ShouldShowOnUnitMono(SkillType.AunnPetrifiedDefenseAura, aunnAuraInfo))
showSkills.Add(SkillType.AunnPetrifiedDefenseAura);
showSkills.Remove(SkillType.AunnHeroDamageBearer);
@ -195,7 +195,7 @@ namespace TH1_Renderer
showSkills.Remove(SkillType.AunnHeroDamageBearerBuff);
else if (Table.Instance.SkillDataAssets.GetSkillInfo(SkillType.AunnHeroDamageBearerBuff,
out var aunnDamageBearerInfo)
&& aunnDamageBearerInfo.ShowOnUnitMono)
&& SkillDataAssets.ShouldShowOnUnitMono(SkillType.AunnHeroDamageBearerBuff, aunnDamageBearerInfo))
showSkills.Add(SkillType.AunnHeroDamageBearerBuff);
var toRemove = new List<SkillType>();

View File

@ -635,8 +635,9 @@ namespace TH1_UI.View.Info
var skillList = new List<SkillBase>();
foreach (var skill in unit.Skills)
{
if(!Table.Instance.SkillDataAssets.GetSkillInfo(skill.GetSkillType(), out var info)
|| info.NotShow || !skill.ShowSkill)continue;
var skillType = skill.GetSkillType();
if(!Table.Instance.SkillDataAssets.GetSkillInfo(skillType, out var info)
|| !SkillDataAssets.ShouldShowInUnitSkillList(skillType, info) || !skill.ShowSkill)continue;
skillList.Add(skill);
}

View File

@ -140,7 +140,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 0.7.4f
bundleVersion: 0.7.4g
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0