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

moment

Browse Source
This commit is contained in:
kawagiri 2026-02-27 14:22:21 +08:00
parent 1af0329b90
commit 5c8b8249e2
33 changed files with 3439 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ExcelExport/Excel/Moment.xlsx
View File

Binary file not shown.

BIN
ExcelExport/GenerateBytes/AIConfig.bytes Normal file
View File

Binary file not shown.

BIN
ExcelExport/GenerateBytes/GeoDesc.bytes Normal file
View File

Binary file not shown.

BIN
ExcelExport/GenerateBytes/Moment.bytes Normal file
View File

Binary file not shown.

2
ExcelExport/GenerateCS/Moment.cs
View File

@ -30,7 +30,7 @@ namespace ExcelConfig
public String MomentSubType { get; set; }
/// <summary>大编号</summary>
[MemoryPackInclude]
public BigId { get; set; }
public int BigId { get; set; }
/// <summary>时刻大类枚举</summary>
[MemoryPackInclude]
public String MomentMainType { get; set; }

2
ExcelExport/GenerateCSPartial/Moment.cs
View File

@ -34,7 +34,7 @@ namespace ExcelConfig
{
Id = (int)ExcelExporter.ConvertValue(cells[row, 3].Text.Trim(), typeof(int));
MomentSubType = (String)ExcelExporter.ConvertValue(cells[row, 4].Text.Trim(), typeof(String));
BigId = ()ExcelExporter.ConvertValue(cells[row, 5].Text.Trim(), typeof());
BigId = (int)ExcelExporter.ConvertValue(cells[row, 5].Text.Trim(), typeof(int));
MomentMainType = (String)ExcelExporter.ConvertValue(cells[row, 6].Text.Trim(), typeof(String));
MediumId = (int)ExcelExporter.ConvertValue(cells[row, 7].Text.Trim(), typeof(int));
SmallId = (int)ExcelExporter.ConvertValue(cells[row, 8].Text.Trim(), typeof(int));

BIN
Tools/Multilingual.xlsx
View File

Binary file not shown.

4
Tools/MultilingualTxt.txt
View File

File diff suppressed because one or more lines are too long

381
Unity/Assets/Resources/DataAssets/MomentDataAssets.asset
View File

@ -12,3 +12,384 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 30fca770483fc864dbe172b8ce06a6da, type: 3}
m_Name: MomentDataAssets
m_EditorClassIdentifier:
MomentMainDataList:
- MomentType: 0
TitleBG: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1}
DescBG: {r: 0.3647059, g: 0.3647059, b: 0.3647059, a: 1}
TitleTextBG: {r: 1, g: 1, b: 1, a: 1}
BigTitleTextColor: {r: 0.3647059, g: 0.3647059, b: 0.3647059, a: 1}
Title: "\u81F3\u6697\u65F6\u523B!"
ImagePacks:
- Image: {fileID: 21300000, guid: 59aaa132cade38a46bb8ab1df0337a64, type: 3}
Empire:
Civ: 2
Force: 2
- Image: {fileID: 21300000, guid: bf82788daed413d4d9b88a6f7f598b96, type: 3}
Empire:
Civ: 3
Force: 3
- Image: {fileID: 21300000, guid: 4897496ef12efee49837cb087dfab1ba, type: 3}
Empire:
Civ: 1
Force: 1
- MomentType: 1
TitleBG: {r: 0.62352943, g: 0.26666668, b: 0.26666668, a: 1}
DescBG: {r: 1, g: 0.41960785, b: 0.41960785, a: 1}
TitleTextBG: {r: 1, g: 1, b: 1, a: 1}
BigTitleTextColor: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1}
Title: "\u9006\u5883\u65F6\u523B!"
ImagePacks:
- Image: {fileID: 21300000, guid: 59aaa132cade38a46bb8ab1df0337a64, type: 3}
Empire:
Civ: 2
Force: 2
- Image: {fileID: 21300000, guid: bf82788daed413d4d9b88a6f7f598b96, type: 3}
Empire:
Civ: 3
Force: 3
- Image: {fileID: 21300000, guid: 4897496ef12efee49837cb087dfab1ba, type: 3}
Empire:
Civ: 1
Force: 1
- MomentType: 2
TitleBG: {r: 0.3764706, g: 0.5176471, b: 0.3882353, a: 1}
DescBG: {r: 0.63529414, g: 0.7254902, b: 0.64705884, a: 1}
TitleTextBG: {r: 1, g: 1, b: 1, a: 1}
BigTitleTextColor: {r: 1, g: 1, b: 1, a: 1}
Title: "\u632F\u594B\u65F6\u523B!"
ImagePacks:
- Image: {fileID: 21300000, guid: 1479b00d8174f86468af59ec16b40bfe, type: 3}
Empire:
Civ: 2
Force: 2
- Image: {fileID: 21300000, guid: 30325dbf474b2e24c8c81934e41667de, type: 3}
Empire:
Civ: 3
Force: 3
- Image: {fileID: 21300000, guid: 0f38bbb89d92aef429b37c58e767d128, type: 3}
Empire:
Civ: 1
Force: 1
- Image: {fileID: 21300000, guid: e350e0d864ffd1c4bb3ffe420d3ac222, type: 3}
Empire:
Civ: 1
Force: 1
- Image: {fileID: 21300000, guid: 8006d81f8db72f3439f5c9a0e4473fe5, type: 3}
Empire:
Civ: 2
Force: 2
- MomentType: 3
TitleBG: {r: 1, g: 0.21568628, b: 0.2784314, a: 1}
DescBG: {r: 1, g: 1, b: 0.8745098, a: 1}
TitleTextBG: {r: 0.8117647, g: 0.42745098, b: 0.23137255, a: 1}
BigTitleTextColor: {r: 0.91764706, g: 1, b: 0.7019608, a: 1}
Title: "\u5149\u8363\u65F6\u523B!"
ImagePacks:
- Image: {fileID: 21300000, guid: 90860e729c168db42aba0c94d9492580, type: 3}
Empire:
Civ: 2
Force: 2
- Image: {fileID: 21300000, guid: c76827e6fa68cea43a0af34389da5a06, type: 3}
Empire:
Civ: 3
Force: 3
- Image: {fileID: 21300000, guid: fbaf224a3000e5f46a387b00e61849d9, type: 3}
Empire:
Civ: 1
Force: 1
MomentSubDataList:
- MomentType: 0
SubType: 101001
Title: "\u82F1\u96C4\u727A\u7272!"
Desc: "\u867D\u7136\u5012\u4E0B\u4E86\uFF0C\u4F46\u59FF\u52BF\u8D85\u5E05\u7684\uFF01"
ImagePacks: []
- MomentType: 0
SubType: 101002
Title: "\u9996\u90FD\u6CA6\u9677!"
Desc: "\u53EA\u662F\u501F\u7ED9\u4ED6\u4EEC\u4E00\u5C0F\u4F1A\u513F!"
ImagePacks: []
- MomentType: 0
SubType: 101003
Title: "\u57CE\u5E02\u6CA6\u9677!"
Desc: "\u4E0B\u6B21\u6211\u4EEC\u5E26\u66F4\u591A\u4EBA\u62A2\u56DE\u6765!"
ImagePacks: []
- MomentType: 1
SubType: 201004
Title: "\u57CE\u5E02\u5371\u96BE!"
Desc: "\u4F60\u662F\u6765\u8E22\u9986\u7684\u5427!"
ImagePacks: []
- MomentType: 1
SubType: 201005
Title: "\u57CE\u5E02\u88AB\u56F4!"
Desc: "\u7C89\u4E1D\u591A\u4E5F\u4E0D\u4E00\u5B9A\u662F\u597D\u4E8B"
ImagePacks: []
- MomentType: 1
SubType: 201006
Title: "\u5149\u8363\u727A\u7272!"
Desc: "\u6211\u65B9\u5DE8\u4EBA\u6B7B\u4EA1"
ImagePacks: []
- MomentType: 1
SubType: 201007
Title: "\u593A\u5B9D\u5931\u8D25!"
Desc: "\u6211\u65B9\u7AD9\u5728\u9057\u8FF9\u4E0A\u7684\u5355\u4F4D\u6B7B\u4EA1"
ImagePacks: []
- MomentType: 2
SubType: 301008
Title: "\u664B\u5347\u4EEA\u5F0F!"
Desc: "\u6211\u65B9\u5355\u4F4D\u664B\u5347\u519B\u5B98"
ImagePacks: []
- MomentType: 2
SubType: 301009
Title: "\u9669\u80DC!"
Desc: "\u6211\u65B9\u4F4E\u8840\u91CF\u5B8C\u6210\u51FB\u6740"
ImagePacks: []
- MomentType: 2
SubType: 301010
Title: "\u53CD\u6740!"
Desc: "\u6211\u65B9\u4F4E\u8840\u91CF\u5B8C\u6210\u53CD\u6740"
ImagePacks: []
- MomentType: 2
SubType: 301011
Title: "\u4E00\u7EBF\u751F\u673A!"
Desc: "\u6211\u65B9\u5355\u4F4D\u53D7\u4F24\u540E\u8FD8\u52691\u70B9\u8840"
ImagePacks: []
- MomentType: 2
SubType: 301012
Title: "\u5C60\u9F99"
Desc: "\u51FB\u6740\u5DE8\u4EBA\u5355\u4F4D"
ImagePacks: []
- MomentType: 2
SubType: 301013
Title: "\u90A3\u662F\u6211\u7684!"
Desc: "\u51FB\u6740\u4F4D\u4E8E\u9057\u8FF9\u4E0A\u7684\u654C\u4EBA"
ImagePacks: []
- MomentType: 2
SubType: 301014
Title: "\u6587\u660E\u4E4B\u63E1!"
Desc: "\u5360\u9886\u4E00\u4E2A\u6751\u5E84"
ImagePacks: []
- MomentType: 2
SubType: 301015
Title: "\u9996\u6218\u544A\u6377!"
Desc: "\u9996\u6B21\u5360\u9886\u5730\u65B9\u7684\u57CE\u5E02"
ImagePacks: []
- MomentType: 2
SubType: 301016
Title: "\u52BF\u5982\u7834\u7AF9!"
Desc: "\u54B1\u7684\u519B\u961F\u65E0\u4EBA\u80FD\u6321\uFF01"
ImagePacks: []
- MomentType: 2
SubType: 301017
Title: "\u4E09\u6740!"
Desc: "\u6218\u795E\u9644\u4F53\uFF01"
ImagePacks: []
- MomentType: 2
SubType: 301018
Title: "\u56DB\u6740!"
Desc: "\u8FD8\u6709\u8C01\uFF01"
ImagePacks: []
- MomentType: 2
SubType: 301019
Title: "\u96F7\u9706\u4E00\u51FB!"
Desc: "\u6EE1\u8840\u4E5F\u7ED9\u4F60\u9001\u8D70\uFF01"
ImagePacks: []
- MomentType: 2
SubType: 301020
Title: "\u5F3A\u654C\u7EC8\u7ED3!"
Desc: "\u51FB\u6740\u4E00\u4E2A\u519B\u5B98\u5355\u4F4D"
ImagePacks: []
- MomentType: 2
SubType: 302001
Title: "\u5927\u90FD\u4F1A!"
Desc: "\u57CE\u5E02\u5347\u5230Lv.6\u53CA\u4EE5\u4E0A"
ImagePacks: []
- MomentType: 2
SubType: 302002
Title: "\u6587\u660E\u57FA\u77F3!"
Desc: "\u56DE\u5408\u91D1\u5E01\u8FBE\u523010"
ImagePacks: []
- MomentType: 2
SubType: 302003
Title: "\u4E95\u7136\u6709\u5E8F!"
Desc: "\u56DE\u5408\u91D1\u5E01\u8FBE\u523020"
ImagePacks: []
- MomentType: 2
SubType: 302004
Title: "\u53D1\u5C55\u5F15\u64CE!"
Desc: "\u56DE\u5408\u91D1\u5E01\u8FBE\u523030"
ImagePacks: []
- MomentType: 2
SubType: 302005
Title: "\u667A\u6167\u706B\u82B1!"
Desc: "\u56DE\u5408\u79D1\u70B9\u6280\u8FBE\u52305"
ImagePacks: []
- MomentType: 2
SubType: 302006
Title: "\u601D\u60F3\u542F\u8499!"
Desc: "\u56DE\u5408\u79D1\u6280\u70B9\u8FBE\u523010"
ImagePacks: []
- MomentType: 2
SubType: 302007
Title: "\u5236\u6D77\u6743!"
Desc: "\u9996\u6B21\u62E5\u6709\u6218\u8230\u5355\u4F4D"
ImagePacks: []
- MomentType: 2
SubType: 302008
Title: "\u5229\u5203\u51FA\u9798!"
Desc: "\u9996\u6B21\u62E5\u6709\u5251\u58EB"
ImagePacks: []
- MomentType: 2
SubType: 302009
Title: "\u96F7\u9706\u51B2\u950B!"
Desc: "\u9996\u6B21\u62E5\u6709\u9A91\u58EB"
ImagePacks: []
- MomentType: 2
SubType: 302010
Title: "\u6218\u4E89\u96F7\u9E23!"
Desc: "\u9996\u6B21\u62E5\u6709\u70AE\u5175"
ImagePacks: []
- MomentType: 2
SubType: 302011
Title: "\u6CF0\u5766\u964D\u4E34!"
Desc: "\u9996\u6B21\u62E5\u6709\u5DE8\u4EBA"
ImagePacks: []
- MomentType: 2
SubType: 302012
Title: "\u81EA\u7136\u5B88\u62A4\u8005!"
Desc: "\u9996\u6B21\u62E5\u6709\u4FDD\u62A4\u533A"
ImagePacks: []
- MomentType: 2
SubType: 302013
Title: "\u601D\u60F3\u6BBF\u5802!"
Desc: "\u9996\u6B21\u62E5\u6709\u5B66\u9662"
ImagePacks: []
- MomentType: 2
SubType: 302014
Title: "\u4E30\u9976\u4E4B\u89D2!"
Desc: "\u9996\u6B21\u62E5\u6709\u8C37\u4ED3"
ImagePacks: []
- MomentType: 2
SubType: 302015
Title: "\u8D38\u6613\u7E41\u8363!"
Desc: "\u9996\u6B21\u62E5\u6709\u5E02\u573A"
ImagePacks: []
- MomentType: 2
SubType: 302016
Title: "\u94F8\u9020\u5927\u5E08!"
Desc: "\u9996\u6B21\u62E5\u6709\u51B6\u70BC\u533A"
ImagePacks: []
- MomentType: 2
SubType: 302017
Title: "\u68EE\u6797\u8109\u52A8!"
Desc: "\u9996\u6B21\u62E5\u6709\u952F\u6728\u5382"
ImagePacks: []
- MomentType: 2
SubType: 302018
Title: "\u7ECF\u7565\u6D77\u6D0B!"
Desc: "\u9996\u6B21\u62E5\u6709\u519B\u6E2F"
ImagePacks: []
- MomentType: 2
SubType: 303001
Title: "\u5315\u73B0\u56FE\u7A77!"
Desc: "\u653B\u51FB\u5EFA\u6709\u5927\u4F7F\u9986\u7684\u73A9\u5BB6"
ImagePacks: []
- MomentType: 3
SubType: 401001
Title: "\u4E94\u6740!"
Desc: "\u8FD9\u64CD\u4F5C\u7B80\u76F4\u79BB\u8C31!"
ImagePacks: []
- MomentType: 3
SubType: 401002
Title: "\u8840\u6D41\u6210\u6CB3!"
Desc: "\u4F4F\u624B\uFF0C\u5FEB\u4F4F\u624B\u554A!"
ImagePacks: []
- MomentType: 3
SubType: 401003
Title: "\u738B\u5EA7\u4E4B\u4E0A!"
Desc: "\u5360\u9886\u654C\u65B9\u7684\u9996\u90FD"
ImagePacks: []
- MomentType: 3
SubType: 401004
Title: "\u4F20\u5947\u7EC8\u7ED3!"
Desc: "\u51FB\u6740\u654C\u65B9\u82F1\u96C4"
ImagePacks: []
- MomentType: 3
SubType: 401005
Title: "\u6545\u571F\u5149\u590D!"
Desc: "\u6536\u590D\u4E00\u4E2A\u57CE\u5E02"
ImagePacks: []
- MomentType: 3
SubType: 401006
Title: "\u6D17\u96EA\u524D\u803B!"
Desc: "\u6536\u590D\u9996\u90FD"
ImagePacks: []
- MomentType: 3
SubType: 402001
Title: "\u5947\u8FF9\u65F6\u4EE3"
Desc: "\u5EFA\u6210\u4E00\u4E2A\u5947\u89C2\u5EFA\u7B51"
ImagePacks: []
- MomentType: 3
SubType: 402002
Title: "\u9EC4\u91D1\u65F6\u4EE3!"
Desc: "\u56DE\u5408\u91D1\u5E01\u8FBE\u523050"
ImagePacks: []
- MomentType: 3
SubType: 402003
Title: "\u70B9\u77F3\u6210\u91D1!"
Desc: "\u56DE\u5408\u91D1\u5E01\u8FBE\u5230100"
ImagePacks: []
- MomentType: 3
SubType: 402004
Title: "\u7406\u6027\u65F6\u4EE3!"
Desc: "\u56DE\u5408\u79D1\u6280\u70B9\u8FBE\u523020"
ImagePacks: []
- MomentType: 3
SubType: 402005
Title: "\u6C38\u6052\u4E4B\u57CE!"
Desc: "\u9996\u6B21\u62E5\u6709Lv.10\u57CE\u5E02"
ImagePacks: []
- MomentType: 3
SubType: 402006
Title: "\u4EBA\u95F4\u5929\u5802!"
Desc: "\u9996\u6B21\u62E5\u6709\u56FD\u5BB6\u516C\u56ED"
ImagePacks: []
- MomentType: 3
SubType: 402007
Title: "\u6587\u660E\u706F\u5854!"
Desc: "\u9996\u6B21\u62E5\u6709Lv.4\u5B66\u9662"
ImagePacks: []
- MomentType: 3
SubType: 402008
Title: "\u4E07\u9877\u826F\u7530!"
Desc: "\u9996\u6B21\u62E5\u6709Lv.5\u8C37\u4ED3"
ImagePacks: []
- MomentType: 3
SubType: 402009
Title: "\u9EC4\u91D1\u4E4B\u8DEF!"
Desc: "\u9996\u6B21\u62E5\u6709Lv.5\u5E02\u573A"
ImagePacks: []
- MomentType: 3
SubType: 402010
Title: "\u5730\u706B\u7194\u7089!"
Desc: "\u9996\u6B21\u62E5\u6709Lv.4\u51B6\u70BC\u533A"
ImagePacks: []
- MomentType: 3
SubType: 402011
Title: "\u6797\u4E1A\u5DE8\u64CE!"
Desc: "\u9996\u6B21\u62E5\u6709Lv.5\u952F\u6728\u5382"
ImagePacks: []
- MomentType: 3
SubType: 302019
Title: "\u5355\u62BD\u51FA\u5947\u8FF9\uFF01"
Desc: "\u4F46\u613F\u4F60\u6316\u5230\u4E86\u597D\u4E1C\u897F"
ImagePacks: []
- MomentType: 3
SubType: 401007
Title: "\u96C4\u5173\u9677\u843D!"
Desc: "\u5360\u9886\u4E00\u4E2ALv.6\u53CA\u4EE5\u4E0A\u7684\u57CE\u5E02"
ImagePacks: []
- MomentType: 2
SubType: 301021
Title: "\u82F1\u96C4\u4E4B\u8DEF!"
Desc: "\u6211\u65B9\u82F1\u96C4\u5347\u7EA7"
ImagePacks: []

BIN
Unity/Assets/Resources/ExcelConfig/GenerateBytes/GeoDesc.bytes
View File

Binary file not shown.

BIN
Unity/Assets/Resources/ExcelConfig/GenerateBytes/Moment.bytes Normal file
View File

Binary file not shown.

7
Unity/Assets/Resources/ExcelConfig/GenerateBytes/Moment.bytes.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5e47a7c6eb9843041ab0ccd06b432599
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

395
Unity/Assets/Resources/Export/MomentDataAssets.asset Normal file
View File

@ -0,0 +1,395 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30fca770483fc864dbe172b8ce06a6da, type: 3}
m_Name: MomentDataAssets
m_EditorClassIdentifier:
MomentMainDataList:
- MomentType: 0
TitleBG: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1}
DescBG: {r: 0.3647059, g: 0.3647059, b: 0.3647059, a: 1}
TitleTextBG: {r: 1, g: 1, b: 1, a: 1}
BigTitleTextColor: {r: 0.3647059, g: 0.3647059, b: 0.3647059, a: 1}
Title: 17558
ImagePacks:
- Image: {fileID: 21300000, guid: 59aaa132cade38a46bb8ab1df0337a64, type: 3}
Empire:
Civ: 2
Force: 2
- Image: {fileID: 21300000, guid: bf82788daed413d4d9b88a6f7f598b96, type: 3}
Empire:
Civ: 3
Force: 3
- Image: {fileID: 21300000, guid: 4897496ef12efee49837cb087dfab1ba, type: 3}
Empire:
Civ: 1
Force: 1
- MomentType: 1
TitleBG: {r: 0.62352943, g: 0.26666668, b: 0.26666668, a: 1}
DescBG: {r: 1, g: 0.41960785, b: 0.41960785, a: 1}
TitleTextBG: {r: 1, g: 1, b: 1, a: 1}
BigTitleTextColor: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1}
Title: 17681
ImagePacks:
- Image: {fileID: 21300000, guid: 59aaa132cade38a46bb8ab1df0337a64, type: 3}
Empire:
Civ: 2
Force: 2
- Image: {fileID: 21300000, guid: bf82788daed413d4d9b88a6f7f598b96, type: 3}
Empire:
Civ: 3
Force: 3
- Image: {fileID: 21300000, guid: 4897496ef12efee49837cb087dfab1ba, type: 3}
Empire:
Civ: 1
Force: 1
- MomentType: 2
TitleBG: {r: 0.3764706, g: 0.5176471, b: 0.3882353, a: 1}
DescBG: {r: 0.63529414, g: 0.7254902, b: 0.64705884, a: 1}
TitleTextBG: {r: 1, g: 1, b: 1, a: 1}
BigTitleTextColor: {r: 1, g: 1, b: 1, a: 1}
Title: 17566
ImagePacks:
- Image: {fileID: 21300000, guid: 1479b00d8174f86468af59ec16b40bfe, type: 3}
Empire:
Civ: 2
Force: 2
- Image: {fileID: 21300000, guid: 30325dbf474b2e24c8c81934e41667de, type: 3}
Empire:
Civ: 3
Force: 3
- Image: {fileID: 21300000, guid: 0f38bbb89d92aef429b37c58e767d128, type: 3}
Empire:
Civ: 1
Force: 1
- Image: {fileID: 21300000, guid: e350e0d864ffd1c4bb3ffe420d3ac222, type: 3}
Empire:
Civ: 1
Force: 1
- Image: {fileID: 21300000, guid: 8006d81f8db72f3439f5c9a0e4473fe5, type: 3}
Empire:
Civ: 2
Force: 2
- MomentType: 3
TitleBG: {r: 1, g: 0.21568628, b: 0.2784314, a: 1}
DescBG: {r: 1, g: 1, b: 0.8745098, a: 1}
TitleTextBG: {r: 0.8117647, g: 0.42745098, b: 0.23137255, a: 1}
BigTitleTextColor: {r: 0.91764706, g: 1, b: 0.7019608, a: 1}
Title: 17564
ImagePacks:
- Image: {fileID: 21300000, guid: 90860e729c168db42aba0c94d9492580, type: 3}
Empire:
Civ: 2
Force: 2
- Image: {fileID: 21300000, guid: c76827e6fa68cea43a0af34389da5a06, type: 3}
Empire:
Civ: 3
Force: 3
- Image: {fileID: 21300000, guid: fbaf224a3000e5f46a387b00e61849d9, type: 3}
Empire:
Civ: 1
Force: 1
MomentSubDataList:
- MomentType: 0
SubType: 101001
Title: 17567
Desc: 17568
ImagePacks: []
- MomentType: 0
SubType: 101002
Title: 17569
Desc: 17570
ImagePacks: []
- MomentType: 0
SubType: 101003
Title: 17571
Desc: 17572
ImagePacks: []
- MomentType: 1
SubType: 201004
Title: 17573
Desc: 17574
ImagePacks: []
- MomentType: 1
SubType: 201005
Title: 17575
Desc: 17576
ImagePacks: []
- MomentType: 1
SubType: 201006
Title: 17577
Desc: 17578
ImagePacks: []
- MomentType: 1
SubType: 201007
Title: 17579
Desc: 17580
ImagePacks: []
- MomentType: 2
SubType: 301008
Title: 17581
Desc: 17582
ImagePacks: []
- MomentType: 2
SubType: 301009
Title: 17583
Desc: 17584
ImagePacks: []
- MomentType: 2
SubType: 301010
Title: 17585
Desc: 17586
ImagePacks: []
- MomentType: 2
SubType: 301011
Title: 17587
Desc: 17588
ImagePacks: []
- MomentType: 2
SubType: 301012
Title: 17589
Desc: 17590
ImagePacks: []
- MomentType: 2
SubType: 301013
Title: 17591
Desc: 17592
ImagePacks: []
- MomentType: 2
SubType: 301014
Title: 17593
Desc: 17594
ImagePacks: []
- MomentType: 2
SubType: 301015
Title: 17595
Desc: 17596
ImagePacks: []
- MomentType: 2
SubType: 301016
Title: 17597
Desc: 17598
ImagePacks: []
- MomentType: 2
SubType: 301017
Title: 17599
Desc: 17600
ImagePacks: []
- MomentType: 2
SubType: 301018
Title: 17601
Desc: 17602
ImagePacks: []
- MomentType: 2
SubType: 301019
Title: 17603
Desc: 17604
ImagePacks: []
- MomentType: 2
SubType: 301020
Title: 17605
Desc: 17606
ImagePacks: []
- MomentType: 2
SubType: 302001
Title: 17607
Desc: 17608
ImagePacks: []
- MomentType: 2
SubType: 302002
Title: 17609
Desc: 17610
ImagePacks: []
- MomentType: 2
SubType: 302003
Title: 17611
Desc: 17612
ImagePacks: []
- MomentType: 2
SubType: 302004
Title: 17613
Desc: 17614
ImagePacks: []
- MomentType: 2
SubType: 302005
Title: 17615
Desc: 17616
ImagePacks: []
- MomentType: 2
SubType: 302006
Title: 17617
Desc: 17618
ImagePacks: []
- MomentType: 2
SubType: 302007
Title: 17619
Desc: 17620
ImagePacks: []
- MomentType: 2
SubType: 302008
Title: 17621
Desc: 17622
ImagePacks: []
- MomentType: 2
SubType: 302009
Title: 17623
Desc: 17624
ImagePacks: []
- MomentType: 2
SubType: 302010
Title: 17625
Desc: 17626
ImagePacks: []
- MomentType: 2
SubType: 302011
Title: 17627
Desc: 17628
ImagePacks: []
- MomentType: 2
SubType: 302012
Title: 17629
Desc: 17630
ImagePacks: []
- MomentType: 2
SubType: 302013
Title: 17631
Desc: 17632
ImagePacks: []
- MomentType: 2
SubType: 302014
Title: 17633
Desc: 17634
ImagePacks: []
- MomentType: 2
SubType: 302015
Title: 17635
Desc: 17636
ImagePacks: []
- MomentType: 2
SubType: 302016
Title: 17637
Desc: 17638
ImagePacks: []
- MomentType: 2
SubType: 302017
Title: 17639
Desc: 17640
ImagePacks: []
- MomentType: 2
SubType: 302018
Title: 17641
Desc: 17642
ImagePacks: []
- MomentType: 2
SubType: 303001
Title: 17643
Desc: 17644
ImagePacks: []
- MomentType: 3
SubType: 401001
Title: 17645
Desc: 17646
ImagePacks: []
- MomentType: 3
SubType: 401002
Title: 17647
Desc: 17648
ImagePacks: []
- MomentType: 3
SubType: 401003
Title: 17649
Desc: 17650
ImagePacks: []
- MomentType: 3
SubType: 401004
Title: 17651
Desc: 17652
ImagePacks: []
- MomentType: 3
SubType: 401005
Title: 17653
Desc: 17654
ImagePacks: []
- MomentType: 3
SubType: 401006
Title: 17682
Desc: 17656
ImagePacks: []
- MomentType: 3
SubType: 402001
Title: 17657
Desc: 17658
ImagePacks: []
- MomentType: 3
SubType: 402002
Title: 17659
Desc: 17660
ImagePacks: []
- MomentType: 3
SubType: 402003
Title: 17661
Desc: 17662
ImagePacks: []
- MomentType: 3
SubType: 402004
Title: 17663
Desc: 17664
ImagePacks: []
- MomentType: 3
SubType: 402005
Title: 17665
Desc: 17666
ImagePacks: []
- MomentType: 3
SubType: 402006
Title: 17667
Desc: 17668
ImagePacks: []
- MomentType: 3
SubType: 402007
Title: 17669
Desc: 17670
ImagePacks: []
- MomentType: 3
SubType: 402008
Title: 17671
Desc: 17672
ImagePacks: []
- MomentType: 3
SubType: 402009
Title: 17673
Desc: 17674
ImagePacks: []
- MomentType: 3
SubType: 402010
Title: 17675
Desc: 17676
ImagePacks: []
- MomentType: 3
SubType: 402011
Title: 17677
Desc: 17678
ImagePacks: []
- MomentType: 3
SubType: 302019
Title: 17679
Desc: 17680
ImagePacks: []
- MomentType: 3
SubType: 401007
Title: 17683
Desc: 17684
ImagePacks: []
- MomentType: 2
SubType: 301021
Title: 17685
Desc: 17686
ImagePacks: []

8
Unity/Assets/Resources/Export/MomentDataAssets.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ba25e002d51215c4c8ae7c382d9f41ad
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

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

File diff suppressed because it is too large Load Diff

140
Unity/Assets/Resources/Prefab/UI/Notify/UINotifyMoment.prefab
View File

@ -27,14 +27,14 @@ RectTransform:
m_GameObject: {fileID: 787962841692706620}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: -1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4239633799330308119}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 203, y: 66}
m_AnchoredPosition: {x: -226, y: 94}
m_SizeDelta: {x: 74.2868, y: 46.3134}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2956077559424556555
@ -59,7 +59,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -104,15 +104,18 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8160434325753013748}
- {fileID: 9148868398109886875}
- {fileID: 6234424829271480423}
- {fileID: 377684272856231084}
- {fileID: 5962474420702085848}
- {fileID: 2233437552544844780}
- {fileID: 3223392692096127307}
- {fileID: 377684272856231084}
m_Father: {fileID: 7830947382640615683}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 314}
m_AnchoredPosition: {x: 501, y: 4}
m_SizeDelta: {x: -1172.7722, y: -659.6844}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &678354771333370127
@ -183,7 +186,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -216,12 +219,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 28
m_fontSize: 36
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 12
m_fontSizeMax: 28
m_fontSizeMax: 36
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -273,7 +276,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 17558
ID: 17564
FontID: 2
TextCfg:
- Type: 0
@ -323,8 +326,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -154.2, y: 59.6}
m_SizeDelta: {x: 214.93231, y: 55.696686}
m_AnchoredPosition: {x: -116.870346, y: 48.64083}
m_SizeDelta: {x: 289.5917, y: 77.615}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &796223627877315966
CanvasRenderer:
@ -348,7 +351,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.216981, b: 0.278894, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -395,11 +398,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7830947382640615683}
m_Father: {fileID: 4239633799330308119}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -54.95569, y: 326.2}
m_AnchoredPosition: {x: -47.8, y: -17}
m_SizeDelta: {x: 267.8566, y: 31.2658}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4726774718619040157
@ -424,7 +427,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -457,12 +460,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 20
m_fontSize: 28
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 12
m_fontSizeMax: 20
m_fontSizeMax: 28
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
@ -514,7 +517,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 17559
ID: 17565
FontID: 2
TextCfg:
- Type: 0
@ -529,6 +532,81 @@ MonoBehaviour:
WordSpacing: 0
LineSpacing: 0
ParagraphSpacing: 0
--- !u!1 &4372766054669596761
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8160434325753013748}
- component: {fileID: 5404091685401128119}
- component: {fileID: 8445460616175423736}
m_Layer: 5
m_Name: Shadow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8160434325753013748
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4372766054669596761}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4239633799330308119}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 17.892, y: -21.949}
m_SizeDelta: {x: 783.01, y: 278.21}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5404091685401128119
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4372766054669596761}
m_CullTransparentMesh: 1
--- !u!114 &8445460616175423736
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4372766054669596761}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.99693024, g: 1, b: 0.87106913, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 4dd1e78d66fe9d8449244c9bf1a638c6, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 2
--- !u!1 &5667194347028622726
GameObject:
m_ObjectHideFlags: 0
@ -563,8 +641,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -50.94104, y: 12.664795}
m_SizeDelta: {x: 310.8409, y: 102.2945}
m_AnchoredPosition: {x: 21.1613, y: -11.0634}
m_SizeDelta: {x: 455.0456, y: 149.7508}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3980861387962979627
CanvasRenderer:
@ -588,7 +666,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.99693024, g: 1, b: 0.87106913, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -641,8 +719,6 @@ RectTransform:
m_Children:
- {fileID: 7364010642696347848}
- {fileID: 4239633799330308119}
- {fileID: 2233437552544844780}
- {fileID: 3223392692096127307}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -881,8 +957,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 21.1, y: 50.6}
m_SizeDelta: {x: 432.4355, y: 349.1801}
m_AnchoredPosition: {x: 150.9, y: 32.2}
m_SizeDelta: {x: 502.7994, y: 470.3626}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8597894410129718579
CanvasRenderer:
@ -906,13 +982,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 53bf5e196adec894e9f51d35f28cd719, type: 3}
m_Sprite: {fileID: 21300000, guid: 1479b00d8174f86468af59ec16b40bfe, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
@ -953,11 +1029,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7830947382640615683}
m_Father: {fileID: 4239633799330308119}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -54.9557, y: 295.53}
m_AnchoredPosition: {x: -46, y: -53}
m_SizeDelta: {x: 267.8566, y: 31.266}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3869707870635250908
@ -982,7 +1058,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -1015,12 +1091,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 16
m_fontSize: 18
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 12
m_fontSizeMax: 16
m_fontSizeMax: 18
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 512

BIN
Unity/Assets/Resources/TH1UI/Notify/Moment/HouraisanDarkestMoment.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 65 KiB

BIN
Unity/Assets/Resources/TH1UI/Notify/Moment/HouraisanKeyMoment.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 152 KiB

After

Width:  |  Height:  |  Size: 106 KiB

62
Unity/Assets/Scripts/TH1_Config/GenerateCS/Moment.cs Normal file
View File

@ -0,0 +1,62 @@
using MemoryPack;
using System;
using System.Collections.Generic;
namespace ExcelConfig
{
[MemoryPackable]
public partial class MomentCategory : ExcelConfigBase
{
[MemoryPackInclude]
public static Dictionary<int, Moment> Dict { get; set; } = new();
public override void Init(byte[] data)
{
Dict = MemoryPackSerializer.Deserialize<Dictionary<int, Moment>>(data);
}
}
[MemoryPackable]
public partial class Moment
{
/// <summary>编号</summary>
[MemoryPackInclude]
public int Id { get; set; }
/// <summary>时刻小类枚举</summary>
[MemoryPackInclude]
public String MomentSubType { get; set; }
/// <summary>大编号</summary>
[MemoryPackInclude]
public int BigId { get; set; }
/// <summary>时刻大类枚举</summary>
[MemoryPackInclude]
public String MomentMainType { get; set; }
/// <summary>中编号</summary>
[MemoryPackInclude]
public int MediumId { get; set; }
/// <summary>小编号</summary>
[MemoryPackInclude]
public int SmallId { get; set; }
/// <summary>tmp文案</summary>
[MemoryPackInclude]
public String tmpDesc { get; set; }
/// <summary>文案名称</summary>
[MemoryPackInclude]
public String Title { get; set; }
/// <summary>文案描述</summary>
[MemoryPackInclude]
public String Desc { get; set; }
[MemoryPackConstructor]
public Moment()
{
}
}
}

11
Unity/Assets/Scripts/TH1_Config/GenerateCS/Moment.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0e20b9dc5b0476b4791ddfdbf8e753c9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

11
Unity/Assets/Scripts/TH1_Core/Events/UIEventManagerBinder.cs
View File

@ -51,6 +51,7 @@ namespace TH1_Core.Events
EventManager.Subscribe<HideUIInfoGridInfo>(HandleHideUIInfoGridInfo);
EventManager.Subscribe<ShowUINotifyCommon>(HandleShowUINotifyCommon);
EventManager.Subscribe<ShowUINotifyMoment>(HandleShowUINotifyMoment);
EventManager.Subscribe<ShowUIOutsideMultiplay>(HandleShowUIOutsideMultiplay);
EventManager.Subscribe<HideUIOutsideMultiplay>(HandleHideUIOutsideMultiplay);
@ -134,7 +135,9 @@ namespace TH1_Core.Events
EventManager.Unsubscribe<HideAllUIInfo>(HandleHideAllUIInfo);
EventManager.Unsubscribe<HideUIInfoGridInfo>(HandleHideUIInfoGridInfo);
EventManager.Unsubscribe<ShowUINotifyCommon>(HandleShowUINotifyCommon);
EventManager.Unsubscribe<ShowUINotifyMoment>(HandleShowUINotifyMoment);
@ -296,6 +299,14 @@ namespace TH1_Core.Events
if (UIManager.Instance.UINotifyManager == null) return;
UIManager.Instance.UINotifyManager.StartNewTask(new UINotifyTask(ViewControllerManager.UINotifyCommonController, evt));
}
private void HandleShowUINotifyMoment(ShowUINotifyMoment evt)
{
if (UIManager.Instance.UINotifyManager == null) return;
UIManager.Instance.UINotifyManager.StartNewMomentTask(new UINotifyTask(ViewControllerManager.UINotifyMomentController, evt));
}
private void HandleShowUIOutsideMultiplay(ShowUIOutsideMultiplay evt)
{

3
Unity/Assets/Scripts/TH1_Data/PlayerData.cs
View File

@ -280,6 +280,7 @@ namespace RuntimeData
public uint Turn;
public CivEnum CivEnum => Table.Instance.TransCivIdToCivEnum(PlayerCivId);
public ForceEnum ForceEnum => Table.Instance.TransForceIdToForceEnum(PlayerForceId);
public Empire Empire => new Empire(CivEnum, ForceEnum);
public uint PlayerCivId;
public uint PlayerForceId;
public uint CradleCityId;
@ -291,7 +292,7 @@ namespace RuntimeData
public int _playerCoin;
public int PlayerTechPoint => _playerTechPoint;
public int _playerTechPoint;
//造山点(主要给守矢使用)
public int PlayerMountainPointUsed;
//分数

24
Unity/Assets/Scripts/TH1_Data/UnitData.cs
View File

@ -143,6 +143,7 @@ namespace RuntimeData
{
return _unitDict.TryGetValue(unitId, out unitData);
}
}
[Serializable]
@ -463,6 +464,29 @@ namespace RuntimeData
LegionId = 0;
}
//----------------------------------------- 判断属性 ----------------------------------------------
public bool IsBigGuy(bool useToCheckDie = false)
{
if(UnitType == UnitType.BigGuy) return true;
if(UnitType == UnitType.KaguyaFrenchWolf) return true;
if(UnitType == UnitType.WolfJuggernaut) return true;
if(UnitType == UnitType.Juggernaut) return true;
if(UnitType == UnitType.RemiliaEgyptianKoakuma && !useToCheckDie) return true;
if(UnitType == UnitType.RemiliaEgyptianKoakumaLion) return true;
if(UnitType == UnitType.MoriyaHebi && UnitLevel >= 3) return true;
return false;
}
public bool IsHero(bool useToCheckDie = false)
{
if(GiantType == GiantType.None && CarryGiantType == GiantType.None) return false;
if(UnitType == UnitType.KaguyaFrenchMokouEgg) return true;
if(GiantType == GiantType.FrenchMokou && useToCheckDie) return false;
return true;
}
// 全局通知调用
public void OnTurnStart(MapData map)
{

15
Unity/Assets/Scripts/TH1_DataAssetsScript/MomentDataAssets.cs
View File

@ -14,14 +14,15 @@ using Unity.VisualScripting;
public enum MomentMainType
{
Darkest,
Adversity,
Key,
Glorious,
DarkestMoment,
AdversityMoment,
KeyMoment,
GloriousMoment,
}
public enum MomentSubType
{
None = 0,
BattleHeroDie = 101001,
BattleCaptainLost = 101002,
BattleCityLost = 101003,
@ -42,6 +43,7 @@ public enum MomentSubType
Battle4Kill = 301018,
BattleKillFullHealth = 301019,
BattleKillOfficer = 301020,
BattleHeroLevelup = 301021,
ExploitBigCity = 302001,
ExploitWealth10 = 302002,
ExploitWealth20 = 302003,
@ -60,6 +62,7 @@ public enum MomentSubType
ExploitFirstForge = 302016,
ExploitFirstSawmill = 302017,
ExploitFirstNavalBase = 302018,
ExploitTreasure = 302019,
DiplomacyBreak = 303001,
Battle5Kill = 401001,
Battle6PlusKill = 401002,
@ -67,6 +70,7 @@ public enum MomentSubType
BattleKillHero = 401004,
BattleOccupyOurCity = 401005,
BattleOccupyOurCaptain = 401006,
BattleOccupyBigCity = 401007,
ExploitWonder = 402001,
ExploitWealth50 = 402002,
ExploitWealth100 = 402003,
@ -167,6 +171,9 @@ public class MomentSubData
public List<MomentImagePack> ImagePacks = new List<MomentImagePack>();
public Sprite GetImage(Empire empire)
{
var t = Table.Instance.MomentDataAssets.GetMomentMainData(MomentType,out var mainData);
return mainData.GetImage(empire);
// 收集所有匹配的候选
Sprite[] candidates = new Sprite[ImagePacks.Count];
int count = 0;

11
Unity/Assets/Scripts/TH1_Logic/Action/ActionLogic.cs
View File

@ -1635,6 +1635,17 @@ namespace Logic.Action
//需要传入player，因为可能unitData已经死了
actionParams.PlayerData.Sight.UpdateSightByPath(actionParams.UnitData,player,pathnode,actionParams.MapData);
//Step #5 Moment
if (actionParams.MapData == Main.MapData
&& targetGrid.Player(actionParams.MapData) == Main.MapData.PlayerMap.SelfPlayerData
&& unit.Player(actionParams.MapData) != Main.MapData.PlayerMap.SelfPlayerData)
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleCityFire,
Empire = Main.MapData.PlayerMap.SelfPlayerData.Empire
});
}
return true;
}

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

@ -15,6 +15,8 @@ using Logic.Audio;
using Logic.CrashSight;
using RuntimeData;
using Steamworks;
using TH1_Core.Events;
using TH1_Core.Managers;
using TH1_Logic.Core;
using UnityEngine;
using TH1Renderer;
@ -123,6 +125,15 @@ namespace Logic.Action
actionParams.UnitData.MP = 0;
actionParams.UnitData.AP = 0;
unitData.Renderer(actionParams.MapData)?.InstantUpdateUnit(true);
//Step #5 处理NotifyMoment
if (actionParams.UnitData.Player(actionParams.MapData) == Main.MapData.PlayerMap.SelfPlayerData)
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleCaptureVillage,
Empire = Main.MapData.PlayerMap.SelfPlayerData.Empire
});
}
return true;
}
}
@ -135,6 +146,15 @@ namespace Logic.Action
//Step #3.5 如果玩家有视野，播放音效
if(actionParams.UnitData.Grid(actionParams.MapData)?.InMainSight() ?? false)
AudioManager.Instance.PlayAudio("SFX/UNIT_levelup");
//Step #4 Moment
if (actionParams.UnitData.Player(actionParams.MapData) == Main.MapData.PlayerMap.SelfPlayerData)
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleLevelup,
Empire = Main.MapData.PlayerMap.SelfPlayerData.Empire
});
}
return true;
}
@ -639,6 +659,16 @@ namespace Logic.Action
if(actionParams.UnitData.Grid(actionParams.MapData)?.InMainSight()??false)
AudioManager.Instance.PlayAudio("SFX/UNIT_levelup");
//Step #4 Moment
if (actionParams.UnitData.Player(actionParams.MapData) == Main.MapData.PlayerMap.SelfPlayerData)
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleHeroLevelup,
Empire = Main.MapData.PlayerMap.SelfPlayerData.Empire
});
}
return true;
}

36
Unity/Assets/Scripts/TH1_Logic/Editor/ExcelEditorWIndow.cs
View File

@ -207,6 +207,42 @@ public class ExcelEditorWIndow : EditorWindow
LogSystem.LogError($"GeoDescCategory.Dict.Count : {GeoDescCategory.Dict.Count}");
}
if(GUILayout.Button("转入 MomentDataAsset"))
{
ConfigManager.Instance.InitExcelConfig();
string dataAssetPath = "DataAssets/MomentDataAssets";
MomentDataAssets momentDataAssets = Resources.Load<MomentDataAssets>(dataAssetPath);
momentDataAssets.MomentSubDataList.Clear();
foreach (var i in MomentCategory.Dict.Keys)
{
if (!System.Enum.TryParse(MomentCategory.Dict[i].MomentSubType, out MomentSubType subType))
{
LogSystem.LogError($"ParseWrong {MomentCategory.Dict[i].MomentSubType}");
continue;
}
if (!System.Enum.TryParse(MomentCategory.Dict[i].MomentMainType, out MomentMainType mainType))
{
LogSystem.LogError($"ParseWrong {MomentCategory.Dict[i].MomentMainType}");
continue;
}
var t = new MomentSubData();
t.SubType = subType;
t.MomentType = mainType;
t.Title = MomentCategory.Dict[i].Title;
t.Desc = MomentCategory.Dict[i].Desc;
momentDataAssets.MomentSubDataList.Add(t);
}
EditorUtility.SetDirty(momentDataAssets);
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
LogSystem.LogError($"MomentCategory.Dict.Count : {MomentCategory.Dict.Count}");
}
}
private static void ClearFolder(string relativeAssetsFolder)

78
Unity/Assets/Scripts/TH1_Logic/Player/PlayerLogic.cs
View File

@ -282,6 +282,13 @@ namespace Logic
{
var gridData = cityData.Grid(mapData);
if (gridData == null) return;
bool momentBeOccupied = false;
bool momentBeOccupiedCaptain = false;
bool momentOccupyLv5 = false;
bool momentOccupyLv6 = false;
bool momentOccupyCaptain = false;
bool momentOccupyOurCaptain = false;
//Step #1 处理logic, 先拿到小兵所属的玩家
if (!mapData.GetPlayerDataByUnitId(unitData.Id, out var playerData)) return;
@ -289,6 +296,26 @@ namespace Logic
//记录oldplayer和newplayer
var oldPid = playerData2.Id;
var newPid = playerData.Id;
if (mapData == Main.MapData && oldPid == mapData.PlayerMap.SelfPlayerId)
{
momentBeOccupied = true;
if(playerData2.CradleCityId == cityData.Id)
momentBeOccupiedCaptain = true;
}
if (mapData == Main.MapData && newPid == mapData.PlayerMap.SelfPlayerId)
{
if(cityData.Level >= 6)
momentOccupyLv6 = true;
else
momentOccupyLv5 = true;
if(playerData2.CradleCityId == cityData.Id)
momentOccupyCaptain = true;
if (playerData.CradleCityId == cityData.Id)
momentOccupyOurCaptain = true;
}
bool lostEmbassy = Main.CityLogic.CheckCradleCapital(mapData, playerData2, cityData);
// 修改城市和玩家的所属关系
if (!mapData.SetCityIdToPlayerId(cityData.Id, playerData.Id))
@ -370,7 +397,56 @@ namespace Logic
Main.PlayerLogic.SetCityTerritoryGridSp(mapData,cityData,GridSpType.KaguyaGrid);
else
Main.PlayerLogic.ClearCityTerritoryGridSp(mapData,cityData,GridSpType.KaguyaGrid);
//Step #12 处理Moment
if (momentOccupyOurCaptain)
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleOccupyOurCaptain,
Empire = Main.MapData.PlayerMap.SelfPlayerData.Empire,
});
}
else if (momentOccupyCaptain)
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleOccupyCaptain,
Empire = Main.MapData.PlayerMap.SelfPlayerData.Empire,
});
}
else if (momentOccupyLv6)
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleOccupyBigCity,
Empire = Main.MapData.PlayerMap.SelfPlayerData.Empire,
});
}
else if (momentOccupyLv5)
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleOccupyCity,
Empire = Main.MapData.PlayerMap.SelfPlayerData.Empire,
});
}
else if (momentBeOccupiedCaptain)
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleCaptainLost,
Empire = Main.MapData.PlayerMap.SelfPlayerData.Empire,
});
}
else if (momentBeOccupied)
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleCityLost,
Empire = Main.MapData.PlayerMap.SelfPlayerData.Empire,
});
}
}

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

@ -20,6 +20,7 @@ using UnityEngine;
using RuntimeData;
using TH1_Anim;
using TH1_Anim.Fragments;
using TH1_Core.Events;
using TH1_Core.Managers;
using TH1_Logic.Core;
using TH1_Presentation.Sequencer.Task;
@ -416,6 +417,53 @@ namespace Logic
pData.RefreshFeelingValue(mapData);
}
//Step #4 Moment Process
if (mapData == Main.MapData && settlement.IsKill)
{
//注意，这里只判断我方击杀的moment,我方被杀的moment要在unitDie里判断
bool killHero = false;
bool killTreasure = false;
bool killFull = false;
bool killBigGuy = false;
bool killWithLow = false;
bool killOfficer = false;
bool oneHP = false;
bool counterLow = false;
if (origin.Player(mapData) == mapData.PlayerMap.SelfPlayerData)
{
if(target.IsHero(true))killHero = true;
if (settlement.DamageValue >= target.GetMaxHealth()) killFull = true;
if(target.IsBigGuy(true))killBigGuy = true;
if(target.IsOfficer())killOfficer = true;
if (target.Grid(mapData, out var grid) && grid.Resource == ResourceType.Treasure) killTreasure = true;
if (origin.Health < 5 && origin.Health < origin.GetMaxHealth() * 0.3f) killWithLow = true;
}
if (target.Player(mapData) == mapData.PlayerMap.SelfPlayerData)
{
if (target.Health == 1) oneHP = true;
}
var momentsubType = MomentSubType.None;
if (killHero) momentsubType = MomentSubType.BattleKillHero;
else if (killTreasure)momentsubType = MomentSubType.BattleKillTreasure;
else if (killFull)momentsubType = MomentSubType.BattleKillFullHealth;
else if (killBigGuy)momentsubType = MomentSubType.BattleKillGiant;
else if (killWithLow)momentsubType = MomentSubType.BattleNarrowVictory;
else if (killOfficer)momentsubType = MomentSubType.BattleKillOfficer;
else if (oneHP)momentsubType = MomentSubType.BattleLastStand;
else if (counterLow)momentsubType = MomentSubType.BattleCounterKill;
if(momentsubType != MomentSubType.None)
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = momentsubType,
Empire = Main.MapData.PlayerMap.SelfPlayerData.Empire
});
}
return settlement;
}
@ -457,20 +505,65 @@ namespace Logic
{
unit.Health = 0;
if (!map.GetGridDataByUnitId(unit.Id, out var targetGrid)) return;
bool notifymoment = false;
//如果是伟人死亡，对应的player受到惩罚 penalty=4
if (unit.UnitType == UnitType.Giant
if (unit.UnitType == UnitType.Giant
&& map.GetPlayerDataByUnitId(unit.Id, out var player) &&
Table.Instance.UnitTypeDataAssets.GetUnitTypeInfo(unit.UnitType, unit.GiantType, unit.UnitLevel,
out var info))
player.giantPenalty[(uint)info.ChessType] = 4;
Table.Instance.UnitTypeDataAssets.GetUnitTypeInfo(unit.UnitType, unit.GiantType, unit.UnitLevel,
out var info))
player.giantPenalty[(uint)info.ChessType] = 4;
//如果是英雄战船死亡，对应的player受到惩罚 penalty=4
if (unit.UnitType == UnitType.GiantJuggernaut && unit.CarryUnitType == UnitType.Giant
&& map.GetPlayerDataByUnitId(unit.Id, out var player2) &&
Table.Instance.UnitTypeDataAssets.GetUnitTypeInfo(unit.CarryUnitType, unit.CarryGiantType, unit.CarryUnitLevel,
out var info2))
if (unit.UnitType == UnitType.GiantJuggernaut && unit.CarryUnitType == UnitType.Giant
&& map.GetPlayerDataByUnitId(unit.Id, out var player2) &&
Table.Instance.UnitTypeDataAssets.GetUnitTypeInfo(
unit.CarryUnitType, unit.CarryGiantType,
unit.CarryUnitLevel,
out var info2))
player2.giantPenalty[(uint)info2.ChessType] = 4;
if (map == Main.MapData && unit.Player(map) == map.PlayerMap.SelfPlayerData)
{
if (unit.UnitType == UnitType.Giant || unit.CarryUnitType == UnitType.Giant)
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleHeroDie,
Empire = unit.Player(map).Empire,
});
}
if(unit.IsBigGuy(true))
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleSacrify,
Empire = unit.Player(map).Empire,
});
}
if (unit.Grid(map, out var grid) && grid.Resource == ResourceType.Treasure)
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleTreasure,
Empire = unit.Player(map).Empire,
});
}
}
if (notifymoment && map == Main.MapData && unit.Player(map) == map.PlayerMap.SelfPlayerData)
{
EventManager.Publish(new ShowUINotifyMoment()
{
MomentSubType = MomentSubType.BattleHeroDie,
Empire = unit.Player(map).Empire,
});
}
map.SetUnitDataDie(unit);
map.OnAnyUnitDie(map);

14
Unity/Assets/Scripts/TH1_UI/Core/UINotifyManager.cs
View File

@ -78,7 +78,10 @@ namespace TH1_UI.Core
{
//存储SequencerTask队列，用来序列播放界面&动画
private UINotifyTask _task = null;
//private static bool _isShowing;
private UINotifyTask _momentTask = null;
@ -92,6 +95,8 @@ namespace TH1_UI.Core
{
_task?.Close();
_task = null;
_momentTask?.Close();
_momentTask = null;
}
public void StartNewTask(UINotifyTask task)
@ -101,6 +106,13 @@ namespace TH1_UI.Core
_task.Execute(()=>OnTaskCompleted(task));
}
public void StartNewMomentTask(UINotifyTask task)
{
if (_momentTask != null) _momentTask.Close();
_momentTask = task;
_momentTask.Execute(()=>OnTaskCompleted(task));
}
private void OnTaskCompleted(UINotifyTask finishedTask)
{
// 只有当结束的任务 确实等于 当前占位的任务时，才置空。

7
Unity/Assets/Scripts/TH1_UI/View/Notify/UINotifyMomentView.cs
View File

@ -1,5 +1,6 @@
// 文件位置: Assets/Scripts/TH1_UI/View/Notify/UINotifyMomentView.cs
using Logic.Multilingual;
using TH1_Core.Events;
using TH1_UI.View.Base;
using TMPro;
@ -37,13 +38,13 @@ namespace TH1_UI.View.Notify
// 设置标题
if (titleText != null)
{
titleText.text = momentSubData.Title;
MultilingualManager.Instance.SetUIText(titleText,momentSubData.Title);
}
// 设置描述
if (descriptionText != null)
{
descriptionText.text = momentSubData.Desc;
MultilingualManager.Instance.SetUIText(descriptionText,momentSubData.Desc);
}
// 获取并设置图片
@ -62,7 +63,7 @@ namespace TH1_UI.View.Notify
// 设置大标题文字
if (bigTitleText != null)
{
bigTitleText.text = momentMainData.Title;
MultilingualManager.Instance.SetUIText(bigTitleText,momentMainData.Title);
bigTitleText.color = momentMainData.BigTitleTextColor;
}

471
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

338
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