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

0.6.5 bug

Browse Source
This commit is contained in:
kawagiri 2026-01-16 15:41:44 +08:00
parent 75c9715e9a
commit f4dbc914ba
15 changed files with 964 additions and 860 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.

244
Tools/MultilingualTxt.txt
View File

File diff suppressed because one or more lines are too long

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

@ -6369,11 +6369,11 @@ MonoBehaviour:
TechDesc:
NeedLockDesc: 0
LockDesc:
Icon: {fileID: 21300000, guid: aeeb277f9373fec4f999acb6290f20fe, type: 3}
IconViewSizeType: 0
Icon: {fileID: 21300000, guid: 14833b6f952970c4f824c41403f11a23, type: 3}
IconViewSizeType: 2
VarientIcon: 0
IconList: []
Cost: 5
Cost: 0
CityExp: 0
NoNeedTech: 0
SpriteSize: {x: 120, y: 120}
@ -6465,11 +6465,11 @@ MonoBehaviour:
TechDesc:
NeedLockDesc: 0
LockDesc:
Icon: {fileID: 21300000, guid: d5934898693f0994baac8a7d87a1a2e8, type: 3}
Icon: {fileID: 21300000, guid: e9b90ca96a0311443bc3e7e83892d622, type: 3}
IconViewSizeType: 2
VarientIcon: 0
IconList: []
Cost: 5
Cost: 0
CityExp: 0
NoNeedTech: 0
SpriteSize: {x: 120, y: 120}

6
Unity/Assets/Resources/DataAssets/SkillDataAssets.asset
View File

@ -1138,7 +1138,7 @@ MonoBehaviour:
SkillName: "\u4E0D\u52A8\u7684\u5927\u56FE\u4E66\u9986"
SkillDesc: "\u82E5\u4E0A\u56DE\u5408\u672A\u79FB\u52A8\uFF0C\u56DE\u5408\u5F00\u59CB\u524D\u83B7\u5F971\u70B9<color=yellow>\u4F53\u529B</color>\u3002
\u79FB\u52A8\u6D88\u80171\u70B9<color=yellow>\u4F53\u529B</color>\uFF0C\u722C\u5C71\u6D88\u80172\u70B9<color=yellow>\u4F53\u529B</color>\u3002\u4F53\u529B\u4E0D\u8DB3\u5219\u6D88\u80173\u70B9HP\u3002
\u6BCF\u70B9<color=yellow>\u4F53\u529B</color>\u63D0\u4F9B\uFF1A+0.5\u653B\u51FB\uFF0C+1\u9632\u5FA1\uFF0C\u56DE\u5408\u7ED3\u675F\u989D\u5916\u6062\u590D1HP\u3002
\u6BCF\u70B9<color=yellow>\u4F53\u529B</color>\u63D0\u4F9B\uFF1A+0.5\u653B\u51FB\uFF0C+0.5\u9632\u5FA1\uFF0C\u56DE\u5408\u7ED3\u675F\u989D\u5916\u6062\u590D1HP\u3002
\u4F53\u529B\u4E0A\u9650\u4E3A2(\u53EF\u5347\u7EA7\u81F34)\u3002"
NotShow: 0
SkillIcon: {fileID: 21300000, guid: 90a131b7e03d81e4f92ac8e0fdab11aa, type: 3}
@ -1149,7 +1149,7 @@ MonoBehaviour:
SkillName: "\u4E0D\u52A8\u7684\u5927\u56FE\u4E66\u9986"
SkillDesc: "\u82E5\u4E0A\u56DE\u5408\u672A\u79FB\u52A8\uFF0C\u56DE\u5408\u5F00\u59CB\u524D\u83B7\u5F971\u70B9<color=yellow>\u4F53\u529B</color>\u3002
\u79FB\u52A8\u6D88\u80171\u70B9<color=yellow>\u4F53\u529B</color>\uFF0C\u722C\u5C71\u6D88\u80172\u70B9<color=yellow>\u4F53\u529B</color>\u3002\u4F53\u529B\u4E0D\u8DB3\u5219\u6D88\u80173\u70B9HP\u3002
\u6BCF\u70B9<color=yellow>\u4F53\u529B</color>\u63D0\u4F9B\uFF1A+0.5\u653B\u51FB\uFF0C+1\u9632\u5FA1\uFF0C\u56DE\u5408\u7ED3\u675F\u989D\u5916\u6062\u590D1HP\u3002
\u6BCF\u70B9<color=yellow>\u4F53\u529B</color>\u63D0\u4F9B\uFF1A+0.5\u653B\u51FB\uFF0C+0.5\u9632\u5FA1\uFF0C\u56DE\u5408\u7ED3\u675F\u989D\u5916\u6062\u590D1HP\u3002
\u4F53\u529B\u4E0A\u9650\u4E3A2(\u53EF\u5347\u7EA7\u81F34)\u3002\u79FB\u52A8\u65F6\u9644\u8FD1\u82E5\u5B58\u5728\u5DF1\u65B9\u82F1\u96C4\uFF0C\u4E0D\u6D88\u8017\u4F53\u529B\u3002"
NotShow: 0
SkillIcon: {fileID: 21300000, guid: 90a131b7e03d81e4f92ac8e0fdab11aa, type: 3}
@ -1158,7 +1158,7 @@ MonoBehaviour:
- SkillType: 116
SkillViewType: 0
SkillName: "\u4F53\u529B"
SkillDesc: "\u6BCF\u5C42\u63D0\u4F9B+0.5\u653B\u51FB\uFF0C+1\u9632\u5FA1\uFF0C\u56DE\u5408\u7ED3\u675F\u989D\u5916\u6062\u590D1HP\u3002
SkillDesc: "\u6BCF\u5C42\u63D0\u4F9B+0.5\u653B\u51FB\uFF0C+0.5\u9632\u5FA1\uFF0C\u56DE\u5408\u7ED3\u675F\u989D\u5916\u6062\u590D1HP\u3002
\u4E0A\u9650\u4E3A2(\u5347\u7EA7\u540E\u4E3A4)\u3002"
NotShow: 0
SkillIcon: {fileID: 21300000, guid: f3269b4f4f71f754696218c3ef9b49c2, type: 3}

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

@ -6369,11 +6369,11 @@ MonoBehaviour:
TechDesc:
NeedLockDesc: 0
LockDesc:
Icon: {fileID: 21300000, guid: aeeb277f9373fec4f999acb6290f20fe, type: 3}
IconViewSizeType: 0
Icon: {fileID: 21300000, guid: 14833b6f952970c4f824c41403f11a23, type: 3}
IconViewSizeType: 2
VarientIcon: 0
IconList: []
Cost: 5
Cost: 0
CityExp: 0
NoNeedTech: 0
SpriteSize: {x: 120, y: 120}
@ -6465,11 +6465,11 @@ MonoBehaviour:
TechDesc:
NeedLockDesc: 0
LockDesc:
Icon: {fileID: 21300000, guid: d5934898693f0994baac8a7d87a1a2e8, type: 3}
Icon: {fileID: 21300000, guid: e9b90ca96a0311443bc3e7e83892d622, type: 3}
IconViewSizeType: 2
VarientIcon: 0
IconList: []
Cost: 5
Cost: 0
CityExp: 0
NoNeedTech: 0
SpriteSize: {x: 120, y: 120}

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

File diff suppressed because one or more lines are too long

6
Unity/Assets/Resources/Export/SkillDataAssets.asset
View File

@ -1136,7 +1136,7 @@ MonoBehaviour:
- SkillType: 115
SkillViewType: 0
SkillName: 1064
SkillDesc: 2362
SkillDesc: 17259
NotShow: 0
SkillIcon: {fileID: 21300000, guid: 90a131b7e03d81e4f92ac8e0fdab11aa, type: 3}
HasShowList: 0
@ -1144,7 +1144,7 @@ MonoBehaviour:
- SkillType: 122
SkillViewType: 0
SkillName: 1064
SkillDesc: 2363
SkillDesc: 17260
NotShow: 0
SkillIcon: {fileID: 21300000, guid: 90a131b7e03d81e4f92ac8e0fdab11aa, type: 3}
HasShowList: 0
@ -1152,7 +1152,7 @@ MonoBehaviour:
- SkillType: 116
SkillViewType: 0
SkillName: 2306
SkillDesc: 2325
SkillDesc: 17261
NotShow: 0
SkillIcon: {fileID: 21300000, guid: f3269b4f4f71f754696218c3ef9b49c2, type: 3}
HasShowList: 0

2
Unity/Assets/Resources/Prefab/UI/Bottom/UIBottomRankingRow.prefab
View File

@ -432,7 +432,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1

1
Unity/Assets/Scripts/TH1_Anim/Fragments/FragmentAttack.cs
View File

@ -100,6 +100,7 @@ namespace TH1_Anim.Fragments
Data.OriginGrid.Renderer(Main.MapData)?.InstantUpdateGrid();
Data.TargetGrid.Renderer(Main.MapData)?.InstantUpdateGrid();
MapRenderer.Instance.UpdateAroundHighlight(Main.MapData,Data.OriginGrid);
return;
}

3
Unity/Assets/Scripts/TH1_Logic/Action/UnitActionLogic.cs
View File

@ -1126,7 +1126,8 @@ namespace Logic.Action
{
tgrid.Renderer(actionParams.MapData)?.PlayVFX(new GridVFXParams(GridVFXType.Fog));
tgrid.Renderer(actionParams.MapData)?.InstantUpdateGrid();
unit.Renderer(actionParams.MapData)?.InstantUpdateUnit(false);
tgrid.Unit(actionParams.MapData)?.Renderer(actionParams.MapData)?.InstantUpdateUnit(false);
}
}

10
Unity/Assets/Scripts/TH1_Renderer/Prefab/UnitMono.cs
View File

@ -44,15 +44,19 @@ public class UnitMono : MonoBehaviour
{
bool defense = Defense.activeSelf;
bool superdefense = SuperDefense.activeSelf;
bool noDefense = !defense && !superdefense;
bool newDefense = false;
bool newSuperDefense = false;
bool newNoDefense = false;
if (defenseBonus > 1.4f && defenseBonus < 3.9f)
newDefense = true;
if(defenseBonus < 1.01f && defenseBonus > 0.99f)
newNoDefense = true;
if (Mathf.Approximately(defenseBonus, 4.0f))
newSuperDefense = true;
if (defense != newDefense || superdefense != newSuperDefense)
if (defense != newDefense || superdefense != newSuperDefense || noDefense != newNoDefense)
{
Defense.SetActive(newDefense);
SuperDefense.SetActive(newSuperDefense);

4
Unity/Assets/Scripts/TH1_Renderer/UnitRenderer.cs
View File

@ -114,13 +114,13 @@ namespace TH1_Renderer
public void RenderUpdateUnitDefense()
{
if (!_unitData.IsAlive()) return;
if (_unitData == null || !_unitData.IsAlive()) return;
_unitMono.UpdateUnitDefense(_unitData.GetDefenseMultiplicationParam(Main.MapData));
}
public void RenderUpdateUnitImage()
{
if (_unitData == null) return;
if (_unitData == null ) return;
RenderUpdateUnitInfo();

1
Unity/Assets/Scripts/TH1_UI/Controller/Outside/UIOutsideSelectController.cs
View File

@ -84,6 +84,7 @@ namespace TH1_UI.Controller.Interaction
void _OnBtnCloseClick()
{
WindowScript.CloseView();
EventManager.Publish(new ShowUIOutsideMenu());
Close();
}

5
Unity/Assets/Scripts/TH1_UI/View/Outside/UIOutsideSelectView.cs
View File

@ -253,6 +253,11 @@ namespace TH1_UI.View.Outside
OnStartGame?.Invoke();
}
public void CloseView()
{
AudioManager.Instance.StopMusic();
}
}
}

92
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