kawagiri/TH1
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

bug修复

Browse Source
This commit is contained in:
kawagiri 2026-04-11 10:58:21 +08:00
parent 246d9c9f6e
commit 0add9d73f1
20 changed files with 3779 additions and 1834 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tools/Multilingual.xlsx
View File

Binary file not shown.

6
Tools/MultilingualTxt.txt
View File

File diff suppressed because one or more lines are too long

2
Tools/OPSFile.txt
View File

File diff suppressed because one or more lines are too long

4197
Unity/Assets/OPS/Obfuscator/Log/StandaloneWindows64.txt
View File

File diff suppressed because it is too large Load Diff

2
Unity/Assets/Resources/DataAssets/ActionDataAssets.asset
View File

@ -7836,7 +7836,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: "\u697C\u9640\u7F57\u706B\u8F66"
Desc: "\u53E4\u660E\u5730\u5E1D\u56FD\u7279\u8272\u91CD\u9A91\u5175\u5355\u4F4D\u3002\u62E5\u6709\u7279\u8272\u80FD\u529B**<\u8FDE\u7EED\u51FB\u6740>**\u548C**<\u4E09\u754C\u6C89\u6CA6>**\u3002"
Desc: "\u53E4\u660E\u5730\u5E1D\u56FD\u7279\u8272\u91CD\u9A91\u5175\u5355\u4F4D\u3002\u62E5\u6709\u7279\u8272\u80FD\u529B**<\u4E09\u754C\u6C89\u6CA6>**\u3002"
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0

2
Unity/Assets/Resources/DataAssets/PlayerDataAssets.asset
View File

@ -136,7 +136,7 @@ MonoBehaviour:
Color: {r: 0.101960786, g: 0.4509804, b: 0.45490196, a: 1}
FlagIcon: {fileID: 21300000, guid: cd665268ad4db764aa8b2357146af1f9, type: 3}
Diff: 2
TechAtomList: 5b0000005c0000005d000000
TechAtomList: 5b0000005c0000005d00000063000000
EmpireDesc: "\u96F7\u9706\u9B3C\u738B\u8C6A\u996E\u795E\u9152\uFF0C\u82CF\u5229\u8036\u795E\u5B50\u63B7\u51FA\u5343\u5146\u8000\u6591\uFF0C\u65E0\u5FC3\u795E\u660E\u6084\u7136\u62E8\u52A8\u4FF1\u5362\u4E4B\u91CE\u7684\u8F6E\u76D8\u3002\u65E7\u5730\u72F1\u7684\u4E1A\u706B\u4EA4\u7EC7\u7740\u68B5\u5929\u7684\u9882\u6B4C\uFF0C\u53E4\u660E\u5730\u89C9\u76D8\u5750\u4E8E\u5730\u5E95\u83B2\u5EA7\u4E4B\u4E0A\uFF0C\u4EE5\u6D1E\u5F7B\u4E07\u5FC3\u4E4B\u773C\u4E66\u5199\u7740\u5420\u9640\u53F2\u8BD7\u7684\u65E0\u4E0A\u6CD5\u5178\u3002"
LeaderDesc: "\u6C89\u9759\u800C\u53EF\u6016\u7684\u5730\u7075\u6BBF\u4E3B\u4EBA\u62BD\u5230\u4E86<color=orange>\u5370\u5EA6</color>\u5E1D\u56FD\u5361\u3002
\u5979\u53EA\u662F\u6765\u5BFB\u627E\u59B9\u59B9\u548C\u5BA0\u7269\uFF0C\u7A00\u91CC\u7CCA\u6D82\u52A0\u5165\u4E86\u5BF9\u5C40\u3002"

2
Unity/Assets/Resources/DataAssets/TechDataAssets.asset
View File

@ -4806,7 +4806,7 @@ MonoBehaviour:
iconViewSizeType: 1
- TechAtom: 99
TechAtomName: "\u8BAD\u7EC3\u697C\u9640\u7F57\u706B\u8F66"
Desc: "\u53E4\u660E\u5730\u5E1D\u56FD\u7279\u8272\u91CD\u9A91\u5175\u5355\u4F4D\u3002\u62E5\u6709\u7279\u8272\u80FD\u529B**<\u8FDE\u7EED\u51FB\u6740>**\u548C**<\u4E09\u754C\u6C89\u6CA6>**\u3002"
Desc: "\u53E4\u660E\u5730\u5E1D\u56FD\u7279\u8272\u91CD\u9A91\u5175\u5355\u4F4D\u3002\u62E5\u6709\u7279\u8272\u80FD\u529B**<\u4E09\u754C\u6C89\u6CA6>**\u3002"
IsAddSkill: 0
AddSkillCondition: []
AddSkillType: 0

10
Unity/Assets/Resources/DataAssets/UnitTypeDataAssets.asset
View File

@ -5227,7 +5227,7 @@ MonoBehaviour:
MoveRange: 1
AttackRange: 1
Cost: 0
Skills: 20000000eb000000
Skills: 20000000eb00000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 73ae037f4b5dab74caa7b0457186a8a6, type: 3}
IsSpriteVarient: 0
@ -5253,7 +5253,7 @@ MonoBehaviour:
MoveRange: 1
AttackRange: 1
Cost: 0
Skills: 20000000eb000000ec000000
Skills: 20000000eb000000ec00000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 73ae037f4b5dab74caa7b0457186a8a6, type: 3}
IsSpriteVarient: 0
@ -5279,7 +5279,7 @@ MonoBehaviour:
MoveRange: 1
AttackRange: 1
Cost: 0
Skills: 20000000eb000000ec000000ed000000
Skills: 20000000eb000000ec000000ed00000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 73ae037f4b5dab74caa7b0457186a8a6, type: 3}
IsSpriteVarient: 0
@ -5305,7 +5305,7 @@ MonoBehaviour:
MoveRange: 1
AttackRange: 1
Cost: 0
Skills: 20000000eb000000ec000000ed000000f0000000
Skills: 20000000eb000000ec000000ed000000f000000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 73ae037f4b5dab74caa7b0457186a8a6, type: 3}
IsSpriteVarient: 0
@ -5790,7 +5790,7 @@ MonoBehaviour:
GiantCivId: 0
GiantForceId: 0
Name: "\u697C\u9640\u7F57\u706B\u8F66"
Desc: "\u53E4\u660E\u5730\u5E1D\u56FD\u7279\u8272\u91CD\u9A91\u5175\u5355\u4F4D\u3002\u62E5\u6709\u7279\u8272\u80FD\u529B**<\u8FDE\u7EED\u51FB\u6740>**\u548C**<\u4E09\u754C\u6C89\u6CA6>**\u3002"
Desc: "\u53E4\u660E\u5730\u5E1D\u56FD\u7279\u8272\u91CD\u9A91\u5175\u5355\u4F4D\u3002\u62E5\u6709\u7279\u8272\u80FD\u529B**<\u4E09\u754C\u6C89\u6CA6>**\u3002"
LandType: 1
NoMaxHealth: 0
MaxHealth: 10

2
Unity/Assets/Resources/Export/ActionDataAssets.asset
View File

@ -7836,7 +7836,7 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
ActionName: 18217
Desc: 18220
Desc: 18828
NeedTechDesc: 0
TechDesc:
NeedLockDesc: 0

128
Unity/Assets/Resources/Export/Multilingual.asset
View File

@ -362491,61 +362491,6 @@ MonoBehaviour:
IsSpecialTerm: 0
Color:
Icon:
- ID: 18821
ZH: English
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18822
ZH: Chinese
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18823
ZH: Heads-up! The current version of the game is in **<Chinese >**only.**< English
>**and more languages are on the way. Thank you for your patience and support!
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18824
ZH: "[Beta 0.7.0]\n\u53D1\u5E03\u65E5\u671F 26.4.10\n\n\u6CE8\u610F\uFF1A\u672C\u6D4B\u8BD5\u7248\u672C\u4E0D\u7A33\u5B9A\uFF0C\u5C1A\u6709\u8F83\u591Abug\uFF0C\u5C06\u4F1A\u5728\u540E\u7EED\u51E0\u5929\u6D4B\u8BD5\u4E2D\u5C3D\u5FEB\u4FEE\u590D\uFF0C\u8FD8\u8BF7\u8C05\u89E3\n\n--------
[\u65B0\u5185\u5BB9] --------\n1.\u53E4\u660E\u5730\u5E1D\u56FD\u4E0A\u7EBF\uFF0C\u8BE6\u60C5\u8BF7\u53C2\u8003\u6E38\u620F\u5185\u4ECB\u7ECD\n2.\u6587\u5316\u503C\u7CFB\u7EDF\u4E0A\u7EBF\uFF0C\u6574\u5408\u4E86\u82F1\u96C4\u3001\u53F2\u8BD7\u3001\u6CD5\u5178\u7B49\u6A21\u5757\uFF0C\u8BE6\u60C5\u8BF7\u53C2\u8003\u6E38\u620F\u5185\u4ECB\u7ECD\n\n--------
@ -362567,4 +362512,77 @@ MonoBehaviour:
IsSpecialTerm: 0
Color:
Icon:
- ID: 18825
ZH: English
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18826
ZH: Chinese
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18827
ZH: Heads-up! The current version of the game is in **<Chinese >**only.**< English
>**and more languages are on the way. Thank you for your patience and support!
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18828
ZH: "\u53E4\u660E\u5730\u5E1D\u56FD\u7279\u8272\u91CD\u9A91\u5175\u5355\u4F4D\u3002\u62E5\u6709\u7279\u8272\u80FD\u529B**<18205>**\u3002"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
TargetTypes: 010000000200000003000000040000000500000006000000070000000800000009000000

2
Unity/Assets/Resources/Export/PlayerDataAssets.asset
View File

@ -134,7 +134,7 @@ MonoBehaviour:
Color: {r: 0.101960786, g: 0.4509804, b: 0.45490196, a: 1}
FlagIcon: {fileID: 21300000, guid: cd665268ad4db764aa8b2357146af1f9, type: 3}
Diff: 2
TechAtomList: 5b0000005c0000005d000000
TechAtomList: 5b0000005c0000005d00000063000000
EmpireDesc: 18178
LeaderDesc: 16615
StartChatBubble:

2
Unity/Assets/Resources/Export/TechDataAssets.asset
View File

@ -4806,7 +4806,7 @@ MonoBehaviour:
iconViewSizeType: 1
- TechAtom: 99
TechAtomName: 18228
Desc: 18220
Desc: 18828
IsAddSkill: 0
AddSkillCondition: []
AddSkillType: 0

2
Unity/Assets/Resources/Export/UnitTypeDataAssets.asset
View File

@ -5790,7 +5790,7 @@ MonoBehaviour:
GiantCivId: 0
GiantForceId: 0
Name: 18217
Desc: 18220
Desc: 18828
LandType: 1
NoMaxHealth: 0
MaxHealth: 10

2
Unity/Assets/Resources/Prefab/UI/Outside/UIOutsideMenu.prefab
View File

@ -1026,7 +1026,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 18823
ID: 18827
FontID: 0
TextCfg:
- Type: 1

4
Unity/Assets/Scripts/TH1_Logic/Moment/MomentData.cs
View File

@ -1098,7 +1098,7 @@ namespace TH1_Logic.MatchConfig
public override void OnUpgradeHero(MapData mapData, PlayerData self, UnitFullType fullType)
{
if (IsExecute) return;
if (fullType.UnitLevel != 3) return;
if (fullType.UnitLevel != 2) return;
Execute(self);
IsExecute = true;
}
@ -1118,7 +1118,7 @@ namespace TH1_Logic.MatchConfig
public override void OnUpgradeHero(MapData mapData, PlayerData self, UnitFullType fullType)
{
if (IsExecute) return;
if (fullType.UnitLevel != 4) return;
if (fullType.UnitLevel != 3) return;
Execute(self);
IsExecute = true;
}

20
Unity/Assets/Scripts/TH1_Logic/Skill/AllSkill/KomeijiFearSkill.cs
View File

@ -109,11 +109,23 @@ namespace Logic.Skill
// 对敌人造成伤害（不包括自己）
if (target.Id != self.Id && !target.GetSkill(SkillType.KomeijiFearImmune, out _))
{
// 缓存renderer，DamageSettlement可能导致单位死亡后无法获取
var targetRenderer = target.Renderer(map);
Main.UnitLogic.DamageSettlement(map, self, target, 2, DamageType.KillSelf);
// 给周围所有人（包括友军）添加1层KomeijiFear
target.AddOrOverrideSkill(SkillType.KomeijiFear, map, self.Id);
// 记录需要刷新UI的单位
unitsToRefresh.Add(target.Id);
if (target.IsAlive())
{
// 存活：传染恐惧并刷新UI
target.AddOrOverrideSkill(SkillType.KomeijiFear, map, self.Id);
unitsToRefresh.Add(target.Id);
}
else if (map == Main.MapData)
{
// 死亡：即时清除渲染并播放VFX
targetRenderer?.Die();
around.Renderer(map)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Die));
around.Renderer(map)?.InstantUpdateGrid();
}
}
}
}

1
Unity/Assets/Scripts/TH1_Logic/Unit/UnitLogic.cs
View File

@ -1389,7 +1389,6 @@ namespace Logic
var targetType = new UnitFullType()
{ UnitType = unit.UnitType, GiantType = unit.GiantType, UnitLevel = unit.UnitLevel + 1 };
UnitTypeTransform(map,unit,targetType);
player.PlayerHeroData.UpdateHeroMaxCount(targetType.UnitLevel);
// moment
foreach (var item in player.MomentData.Items) item.OnUpgradeHero(map, player, targetType);
return unit.Player(map)?.PlayerHeroData.UpdateHero(map,unit.Player(map),unit.UnitFullType) ?? false;

2
Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoGridInfoView.cs
View File

@ -404,7 +404,7 @@ namespace TH1_UI.View.Info
string title = MultilingualManager.Instance.GetMultilingualTextSafe(unitTypeInfo.Name);
//处理Officer的情况
if (unitData.IsOfficer()) title += "("+ Table.Instance.TextDataAssets.UnitOfficerName+")"; // 示例
if (unitData.IsOfficer()) title += "("+ MultilingualManager.Instance.GetMultilingualText(Table.Instance.TextDataAssets.UnitOfficerName)+")"; // 示例
else if (unitData.IsPrepareOfficer()) title += $"({unitData.GetKillCount()}/3)";
UnitInfoTitle.text = title;

895
Unity/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset
View File

File diff suppressed because one or more lines are too long

332
Unity/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset
View File

File diff suppressed because one or more lines are too long