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 22:27:35 +08:00
parent 922ddaba9a
commit 9b7f7bbf95
26 changed files with 57847 additions and 166 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.

13
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

54861
Unity/Assets/OPS/Obfuscator/Log/StandaloneWindows64.txt Normal file
View File

File diff suppressed because it is too large Load Diff

7
Unity/Assets/OPS/Obfuscator/Log/StandaloneWindows64.txt.meta Normal file
View File

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

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

File diff suppressed because it is too large Load Diff

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

@ -544,6 +544,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -574,6 +575,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -604,6 +606,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -634,6 +637,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -664,6 +668,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -1470,6 +1475,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: cde32337ce156014cac46d597e1abc6e, type: 3}
@ -1500,6 +1506,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 9ae4068de3182e54c9c44e10b66089e6, type: 3}
@ -1569,6 +1576,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 4814901362cb1924ca96564a88e97e74, type: 3}
@ -1599,6 +1607,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 5d2cbba21798bbf47af040f07f81ce58, type: 3}
@ -1682,6 +1691,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -1816,6 +1826,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -1898,6 +1909,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: c7090b827e3b73846848e3d4ca62c43f, type: 3}
@ -1928,6 +1940,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -2075,6 +2088,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -2157,6 +2171,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 1
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: c8aba17a7b79944488e1164a36a2180f, type: 3}
@ -2187,6 +2202,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 7983e5706aca9634188e20ecea690403, type: 3}
@ -2217,6 +2233,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 5
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: afbb41b83c55c794ab8443955957a309, type: 3}
@ -2261,6 +2278,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 128e1895b83c19147a9e7abae5013836, type: 3}
@ -2291,6 +2309,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 8f47db0d7e40c844dae2b8f7272d775b, type: 3}
@ -2321,6 +2340,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -2403,6 +2423,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 40aa4a30b19b43249a613733daf691d0, type: 3}
@ -2433,6 +2454,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: aa3911c874d854b4f8095b071023d183, type: 3}
@ -2463,6 +2485,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: c7d5777daf2acd44da39924ffc07ec92, type: 3}
@ -2493,6 +2516,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 21300000, guid: 6a0350b4b8d6cd841907bd69c550a76b, type: 3}
@ -2523,6 +2547,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 99f299139fee8074babe65db7c3ba2fc, type: 3}
@ -2592,6 +2617,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -2674,6 +2700,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 15241810dc2b8bd4d9fab1bf4ae0ca18, type: 3}
@ -2704,6 +2731,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 4bf88037631fcb44e98fb41078e812c7, type: 3}
@ -2734,6 +2762,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 28481e4b4d1464f40b2463f41f7e0eb4, type: 3}
@ -2803,6 +2832,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -2885,6 +2915,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: a3bcc84a63fcc9d4f98afa1a74445f56, type: 3}
@ -2915,6 +2946,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: d80da634207e4e244b321a5aa04e8f12, type: 3}
@ -2945,6 +2977,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -3145,6 +3178,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 3736fd4d232ac644999388df827da0bd, type: 3}
@ -3175,6 +3209,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -3257,6 +3292,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 3d868222c98661c42b74da854167271b, type: 3}
@ -3287,6 +3323,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 857a9ff2f48ca2240bcd4e39569542a9, type: 3}
@ -3421,6 +3458,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: d7b0a16ac6f53ad4b8820d8c295c6bc1, type: 3}
@ -3451,6 +3489,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: a3c4b263edc024d4791bc9a1c6319e8c, type: 3}
@ -3495,6 +3534,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 64d5279266a224c449ee672a0b0456af, type: 3}
@ -3525,6 +3565,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -3607,6 +3648,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: aff4a8b662070034bb649548185124a6, type: 3}
@ -3731,6 +3773,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 0}
@ -3813,6 +3856,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 78a27ce4c4ee04c44a68b1964faa12e4, type: 3}
@ -3843,6 +3887,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 2b6657e73a55aea4d803ed1a276bd05c, type: 3}
@ -3874,7 +3919,7 @@ MonoBehaviour:
iconViewSizeType: 2
- TechAtom: 65
TechAtomName: "\u6C38\u591C\u6CD5\u5178"
Desc: "\u84EC\u83B1\u5C71\u8F89\u591C\u9881\u5E03\u6C38\u8FDC\u6CD5\u5178\uFF0C\u6C38\u591C\u7B3C\u7F69\u6BCF\u4E00\u5BF8\u56FD\u571F\u3002\u9886\u571F\u5185\u6240\u6709**<\u68EE\u6797>**\u8F6C\u5316\u4E3A**<\u7AF9\u6797>**\uFF0C**<\u52A8\u7269>**\u5219\u8F6C\u5316\u4E3A**<\u5996\u602A\u5154>**\u3002\u81EA\u52A8\u83B7\u5F97\u9996\u90FD4\u683C\u8303\u56F4\u5185\u7684\u9057\u8FF9\u89C6\u91CE\u3002"
Desc: "\u84EC\u83B1\u5C71\u8F89\u591C\u9881\u5E03\u6C38\u591C\u6CD5\u5178\uFF0C\u6C38\u591C\u7B3C\u7F69\u6BCF\u4E00\u5BF8\u56FD\u571F\u3002\u9886\u571F\u5185\u6240\u6709**<\u68EE\u6797>**\u8F6C\u5316\u4E3A**<\u7AF9\u6797>**\uFF0C**<\u52A8\u7269>**\u5219\u8F6C\u5316\u4E3A**<\u5996\u602A\u5154>**\u3002\u81EA\u52A8\u83B7\u5F97\u9996\u90FD4\u683C\u8303\u56F4\u5185\u7684\u9057\u8FF9\u89C6\u91CE\u3002"
IsAddSkill: 0
AddSkillCondition: []
AddSkillType: 0
@ -3910,6 +3955,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 857a9ff2f48ca2240bcd4e39569542a9, type: 3}
@ -3940,6 +3986,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 7895455a857041843b93e9386e215067, type: 3}
@ -4001,6 +4048,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 0}
@ -4031,6 +4079,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 21300000, guid: 1d0a8f4cd1f39dd469e4c7b60a1336be, type: 3}
@ -4075,6 +4124,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 0}
@ -4119,6 +4169,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 49c36825d3b9e4d42bc413f376677ad3, type: 3}
@ -4177,6 +4228,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 0c199a8506752b8498d1ebbf0effb9c0, type: 3}
@ -4207,6 +4259,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 21300000, guid: 49c36825d3b9e4d42bc413f376677ad3, type: 3}
@ -4237,6 +4290,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 21300000, guid: 49c36825d3b9e4d42bc413f376677ad3, type: 3}
@ -4267,6 +4321,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 21300000, guid: 49c36825d3b9e4d42bc413f376677ad3, type: 3}
@ -4297,6 +4352,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 21300000, guid: 49c36825d3b9e4d42bc413f376677ad3, type: 3}
@ -4355,6 +4411,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 49c36825d3b9e4d42bc413f376677ad3, type: 3}
@ -4398,6 +4455,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 49c36825d3b9e4d42bc413f376677ad3, type: 3}
@ -4428,6 +4486,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 0
IconContainer:
Icon: {fileID: 21300000, guid: 49c36825d3b9e4d42bc413f376677ad3, type: 3}
@ -4542,6 +4601,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 0}
@ -4624,6 +4684,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 0}
@ -4654,22 +4715,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
- ActionType: 6
WonderType: 0
ResourceType: 0
FeatureType: 0
TerrainType: 0
UnitType: 38
GiantType: 0
UnitLevel: 0
Vegetation: 0
UnitActionType: 0
CityLevelUpActionType: 0
GridMiscActionType: 0
SkillType: 0
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 0}
@ -4700,22 +4746,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
- ActionType: 6
WonderType: 0
ResourceType: 0
FeatureType: 0
TerrainType: 0
UnitType: 37
GiantType: 0
UnitLevel: 0
Vegetation: 0
UnitActionType: 0
CityLevelUpActionType: 0
GridMiscActionType: 0
SkillType: 0
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 21300000, guid: aff4a8b662070034bb649548185124a6, type: 3}
@ -4746,6 +4777,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 0}
@ -4828,6 +4860,7 @@ MonoBehaviour:
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 0}

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

@ -362766,61 +362766,6 @@ MonoBehaviour:
IsSpecialTerm: 0
Color:
Icon:
- ID: 18860
ZH: ' English '
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18861
ZH: 'Chinese '
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18862
ZH: Heads-up! The current version of the game is in **<18861>**only.**<18860>**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: 18863
ZH: "\u51CF\u5C1130%\u9632\u5FA1\u529B\uFF0C\u5927\u4E8E2\u5C42\u65F6\u53D1\u751F\u7206\u70B8\uFF0C\u5931\u53BB2\u5C42\uFF0C\u5BF9\u5468\u56F4\u5355\u4F4D\u4F20\u67D3**<17945>**\u5E76\u9020\u6210\u4F24\u5BB3\u3002\u6B7B\u4EA1\u65F6\u4EA6\u53D1\u751F\u7206\u70B8\u3002\u7206\u70B8\u5C42\u6570\u4E0D\u8DB32\u5C42\u5219\u4E0D\u4F1A\u9020\u6210\u4F24\u5BB3\u3002\u53EF\u88AB**<1925>**\u6216\u8005**<42>**\u6E05\u9664\u3002"
TDZH:
@ -362877,4 +362822,203 @@ MonoBehaviour:
IsSpecialTerm: 0
Color:
Icon:
- ID: 18869
ZH: "\u884C\u52A8\u70B9\u7CFB\u7EDF"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18870
ZH: "\u7A7A\u884C\u52A8\u70B9"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18871
ZH: "\u65BD\u6CD5\u884C\u52A8\u70B9"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18872
ZH: "\u79FB\u52A8\u884C\u52A8\u70B9"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18873
ZH: "\u901A\u7528\u884C\u52A8\u70B9"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18874
ZH: "**<18873>**\uFF1A\u6BCF\u56DE\u5408\u5C06\u91CD\u7F6E\u4E3A1\u70B9\uFF0C\u5141\u8BB8\u8FDB\u884C\u79FB\u52A8\u3001\u653B\u51FB\u6216\u5176\u4ED6\u4E3B\u52A8\u884C\u4E3A\n**<18802>**\uFF1A\u5141\u8BB8\u8FDB\u884C\u653B\u51FB\n**<18872>**\uFF1A\u5141\u8BB8\u8FDB\u884C\u79FB\u52A8\n**<18871>**\uFF1A\u5141\u8BB8\u9664\u653B\u51FB/\u79FB\u52A8\u4EE5\u5916\u7684\u884C\u4E3A\n**<18870>**\uFF1A\u8868\u793A\u4F60\u5DF2\u7ECF\u6CA1\u6709\u53EF\u7528\u884C\u52A8\u70B9\n\u79FB\u52A8\u3001\u653B\u51FB\u548C\u5927\u591A\u6570\u4E3B\u52A8\u884C\u4E3A\uFF0C\u90FD\u4F1A\u6D88\u8017\u6389\u5F53\u524D\u6240\u6709\u884C\u52A8\u70B9"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18875
ZH: English
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18876
ZH: Chinese
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18877
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: 18878
ZH: "\u79FB\u52A8\u540E\uFF0C\u4E3A\u9644\u8FD1\u654C\u65B9\u5355\u4F4D\u8D4B\u4E881\u5C42**<17945>**"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18879
ZH: "\u84EC\u83B1\u5C71\u8F89\u591C\u9881\u5E03\u6C38\u591C\u6CD5\u5178\uFF0C\u6C38\u591C\u7B3C\u7F69\u6BCF\u4E00\u5BF8\u56FD\u571F\u3002\u9886\u571F\u5185\u6240\u6709**<1436>**\u8F6C\u5316\u4E3A**<17435>**\uFF0C**<874>**\u5219\u8F6C\u5316\u4E3A**<177>**\u3002\u81EA\u52A8\u83B7\u5F97\u9996\u90FD4\u683C\u8303\u56F4\u5185\u7684\u9057\u8FF9\u89C6\u91CE\u3002"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
TargetTypes: 010000000200000003000000040000000500000006000000070000000800000009000000

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

File diff suppressed because it is too large Load Diff

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

@ -3919,7 +3919,7 @@ MonoBehaviour:
iconViewSizeType: 2
- TechAtom: 65
TechAtomName: 1943
Desc: 17371
Desc: 18879
IsAddSkill: 0
AddSkillCondition: []
AddSkillType: 0
@ -4716,23 +4716,6 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
- ActionType: 6
WonderType: 0
ResourceType: 0
FeatureType: 0
TerrainType: 0
UnitType: 38
GiantType: 0
UnitLevel: 0
Vegetation: 0
UnitActionType: 0
CityLevelUpActionType: 0
GridMiscActionType: 0
SkillType: 0
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 0}
@ -4764,23 +4747,6 @@ MonoBehaviour:
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
- ActionType: 6
WonderType: 0
ResourceType: 0
FeatureType: 0
TerrainType: 0
UnitType: 37
GiantType: 0
UnitLevel: 0
Vegetation: 0
UnitActionType: 0
CityLevelUpActionType: 0
GridMiscActionType: 0
SkillType: 0
TechType: 0
PlayerActionType: 0
AIParamType: 0
CultureCardType: 0
UseActionSprite: 1
IconContainer:
Icon: {fileID: 21300000, guid: aff4a8b662070034bb649548185124a6, type: 3}

4
Unity/Assets/Resources/Export/WikiDataAssets.asset
View File

@ -14,11 +14,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
Items:
- Id: 1
Name: "\u884C\u52A8\u70B9\u7CFB\u7EDF"
Name: 18869
Types: 0000000001000000
DescItems:
- DescType: 0
Desc: "**<\u901A\u7528\u884C\u52A8\u70B9>**\uFF1A\u6BCF\u56DE\u5408\u5C06\u91CD\u7F6E\u4E3A1\u70B9\uFF0C\u5141\u8BB8\u8FDB\u884C\u79FB\u52A8\u3001\u653B\u51FB\u6216\u5176\u4ED6\u4E3B\u52A8\u884C\u4E3A\n**<\u653B\u51FB\u884C\u52A8\u70B9>**\uFF1A\u5141\u8BB8\u8FDB\u884C\u653B\u51FB\n**<\u79FB\u52A8\u884C\u52A8\u70B9>**\uFF1A\u5141\u8BB8\u8FDB\u884C\u79FB\u52A8\n**<\u65BD\u6CD5\u884C\u52A8\u70B9>**\uFF1A\u5141\u8BB8\u9664\u653B\u51FB/\u79FB\u52A8\u4EE5\u5916\u7684\u884C\u4E3A\n**<\u7A7A\u884C\u52A8\u70B9>**\uFF1A\u8868\u793A\u4F60\u5DF2\u7ECF\u6CA1\u6709\u53EF\u7528\u884C\u52A8\u70B9\n\u79FB\u52A8\u3001\u653B\u51FB\u548C\u5927\u591A\u6570\u4E3B\u52A8\u884C\u4E3A\uFF0C\u90FD\u4F1A\u6D88\u8017\u6389\u5F53\u524D\u6240\u6709\u884C\u52A8\u70B9"
Desc: 18874
UseHint: 0
HintProvider:
HintDataType: 0

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

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

8
Unity/Assets/Resources/Prefab/unitPrefab.prefab
View File

@ -802,7 +802,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6365787046893573031
RectTransform:
m_ObjectHideFlags: 0
@ -1697,8 +1697,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278222032
m_fontColor: {r: 0.81761, g: 0.48681653, b: 0, a: 1}
rgba: 4278255602
m_fontColor: {r: 0.9493823, g: 1, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@ -1721,7 +1721,7 @@ MonoBehaviour:
m_enableAutoSizing: 1
m_fontSizeMin: 0.2
m_fontSizeMax: 1.2
m_fontStyle: 0
m_fontStyle: 2
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535

5
Unity/Assets/Scripts/TH1_DataAssetsScript/SkillDataAssets.cs
View File

@ -211,6 +211,11 @@ public class SkillInfo
public bool HasShowList;
public List<SkillInfoShowPack> SkillShowList;
public SkillPriority skillPriority;
public bool ReserveOnCarry;
public bool ReserveLeaveCarry;
public bool ReserveGiantUpgrade;
public bool ReserveCommonTransform;
//public bool ReserveLeaveCarry;
}

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

@ -2647,6 +2647,7 @@ namespace Logic.Action
public override bool CheckCan(CommonActionParams actionParams)
{
if (actionParams.MainObjectType != MainObjectType.Player) return false;
var map = actionParams.MapData;
var player = actionParams.PlayerData;
return player.PlayerCultureInfo.CheckCanBuyCultureCard(map, player, _actionId.CultureCardType);
@ -2655,6 +2656,7 @@ namespace Logic.Action
public override bool CheckShow(CommonActionParams actionParams,out ShowType showType)
{
showType = ShowType.None;
if (actionParams.MainObjectType != MainObjectType.Player) return false;
var map = actionParams.MapData;
var player = actionParams.PlayerData;
return player.PlayerCultureInfo.CheckCanBuyCultureCard(map, player, _actionId.CultureCardType);

22
Unity/Assets/Scripts/TH1_Logic/MatchConfig/MatchSettlementInfo.cs
View File

@ -116,6 +116,28 @@ namespace TH1_Logic.MatchConfig
PlayerSettlementGroup.RefreshPlayerSettlementGroup(map, player, kv.Value);
}
logic.Refresh(map, map.MatchSettlement);
// DEBUG: 输出结算状态
/*if (!map.MatchSettlement.IsFinished)
{
var debugStr = $"[Settlement] Type={map.MatchSettlement.SettlementType} IsFinished={map.MatchSettlement.IsFinished} PlayerCount={map.MatchSettlement.PlayerSettlements.Count}";
foreach (var kv in map.MatchSettlement.PlayerSettlements)
{
var p = map.PlayerMap.GetPlayerData(kv.Key);
var isAI = map.CheckIsAI(kv.Key);
var taskCount = 0;
foreach (var s in kv.Value.Settlements) taskCount += s.Tasks?.Count ?? 0;
debugStr += $"\n Player{kv.Key}(AI={isAI},Alive={p?.IsSurvival}): Group.IsSettlement={kv.Value.IsSettlement} IsWin={kv.Value.IsWin} Settlements={kv.Value.Settlements.Count} Tasks={taskCount}";
foreach (var s in kv.Value.Settlements)
{
debugStr += $"\n Settlement(Type={s.SettlementType}): IsSettled={s.IsSettlement} IsWin={s.IsWin}";
if (s.Tasks != null)
foreach (var t in s.Tasks)
debugStr += $"\n Task(Type={t.TaskType} P1={t.Param1}): IsSettled={t.IsSettlement} IsSuccess={t.IsSuccess} Cur={t.Param1Cur}";
}
}
UnityEngine.Debug.Log(debugStr);
}*/
}
}

4
Unity/Assets/Scripts/TH1_Logic/MatchConfig/PlayerTask.cs
View File

@ -176,13 +176,13 @@ namespace TH1_Logic.MatchConfig
}
info.Param1Cur = (int)player.Turn;
if (player.IsSurvival && player.Turn >= info.Param1)
if (player.IsSurvival && player.Turn >= info.Param1)
{
info.IsSettlement = true;
info.IsSuccess = true;
}
}
}
}
/// <summary>

3
Unity/Assets/Scripts/TH1_Logic/Skill/AllSkill/JunkerOfficerSkill.cs
View File

@ -39,8 +39,7 @@ namespace Logic.Skill
public override void OnDamageOther(MapData mapData, SettlementInfo info)
{
if (info.DamageOrigin == null || info.DamageTarget == null|| !info.IsKill) return;
//TODO 这里为水运单位特判
if (info.DamageOrigin.GetSkill(SkillType.CARRY, out var _)) return;
if (info.DamageOrigin.IsOnCarry()) return;
_kill++;
}

3
Unity/Assets/Scripts/TH1_Logic/Skill/AllSkill/OfficerSkill.cs
View File

@ -46,8 +46,7 @@ namespace Logic.Skill
public override void OnDamageOther(MapData mapData, SettlementInfo info)
{
if (info.DamageOrigin == null || info.DamageTarget == null|| !info.IsKill) return;
//TODO 这里为水运单位特判
if (info.DamageOrigin.GetSkill(SkillType.CARRY, out var _)) return;
if (info.DamageOrigin.IsOnCarry()) return;
_kill++;
}

14
Unity/Assets/Scripts/TH1_Logic/Skill/SkillBase.cs
View File

@ -676,18 +676,30 @@ namespace Logic.Skill
public virtual bool ReservedOnTransformBoat(UnitData self, UnitFullType fullType)
{
if (Table.Instance.SkillDataAssets.GetSkillInfo(GetSkillType(), out var skillInfo))
return skillInfo.ReserveLeaveCarry;
return false;
}
public virtual bool ReservedOnTransformUpgrade(UnitData self, UnitFullType fullType)
{
//如果是临时的buff或者debuff 技能，通常就是继承的
if (!IsPermanent) return true;
if (Table.Instance.SkillDataAssets.GetSkillInfo(GetSkillType(), out var skillInfo))
{
//如果是buff或者debuff 通常也是继承的
if (skillInfo.SkillViewType is SkillViewType.Positive or SkillViewType.Negative) return true;
bool isGiantUpgrade = fullType.GiantType != GiantType.None;
return isGiantUpgrade ? skillInfo.ReserveGiantUpgrade : skillInfo.ReserveCommonTransform;
}
//如果是临时的buff或者debuff 技能，通常就是继承的
return true;
}
public virtual bool ReservedOnTransformFromBoat(UnitData self, UnitFullType fullType)
{
if (Table.Instance.SkillDataAssets.GetSkillInfo(GetSkillType(), out var skillInfo))
return skillInfo.ReserveOnCarry;
return false;
}

3
Unity/Assets/Scripts/TH1_Logic/WiKi/WikiData.cs
View File

@ -8,6 +8,7 @@
using System;
using System.Collections.Generic;
using Logic.Multilingual;
using UI.HintUI;
using UnityEngine;
@ -52,6 +53,7 @@ namespace TH1_Logic.MatchConfig
public class WikiItem
{
public uint Id;
[MultilingualField]
public string Name;
public List<WikiType> Types = new List<WikiType>();
public List<DescItem> DescItems = new List<DescItem>();
@ -72,6 +74,7 @@ namespace TH1_Logic.MatchConfig
public class DescItem
{
public WikiDescType DescType;
[MultilingualField]
public string Desc;
public bool UseHint;
public HintDataProvider HintProvider;

5
Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoCommonBaseActionCircleMono.cs
View File

@ -72,7 +72,10 @@ namespace TH1_UI.View.Info
}
//Step #0 基础变量设置
if (!Table.Instance.ActionDataAssets.GetActionInfo(actionId, out var info)) return;
if (!Table.Instance.ActionDataAssets.GetActionInfo(actionId, out var info))
{
return;
}
var player = Main.MapData.PlayerMap.SelfPlayerData;
//Step #1 处理图片 名字

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

@ -61,7 +61,7 @@ namespace TH1_UI.View.Info
var player = Main.MapData.PlayerMap.SelfPlayerData;
var actionId = new CommonActionId { ActionType = CommonActionType.BuyCultureCard, CultureCardType = _cardInfo.CardType};
var action = ActionLogicFactory.GetActionLogic(actionId);
var param = new CommonActionParams(Main.MapData, playerData: player);
var param = new CommonActionParams(Main.MapData, playerData: player, mainObjectType: MainObjectType.Player);
param.RefreshParams();
// check can 能过就能买成功
if (!action.CheckCan(param)) return;

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

@ -617,7 +617,6 @@ namespace TH1_UI.View.Info
}
ActionArea.SetActive(true);
ActionHint.gameObject.SetActive(true);
_actionCount = actionList.Count;
//Step #2 确定格位够不够
while (ActionCircleMonoList.Count < actionList.Count)
{
@ -627,6 +626,17 @@ namespace TH1_UI.View.Info
ActionCircleMonoList.Add(actionCircle.GetComponent<UIInfoCommonBaseActionCircleMono>());
}
//Step #2.5 过滤掉未在ActionData中配置的action
for (int i = actionList.Count - 1; i >= 0; i--)
{
if (!Table.Instance.ActionDataAssets.GetActionInfo(actionList[i].ActionId, out _))
{
actionList.RemoveAt(i);
cantTypeList.RemoveAt(i);
}
}
_actionCount = actionList.Count;
//Step #3 设置每一个action
for (int i = 0; i < ActionCircleMonoList.Count; i++)
{

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

369
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