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

Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 into main

Browse Source
This commit is contained in:
wuwenbo 2026-04-03 18:47:14 +08:00
commit f6e7b91f83
34 changed files with 1911 additions and 277 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.

300
Tools/MultilingualTxt.txt
View File

File diff suppressed because one or more lines are too long

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

@ -1086,7 +1086,7 @@ MonoBehaviour:
Icon: {fileID: 0}
SkillDesc: "\u4E0D\u5360\u7528\u57CE\u5E02\u4EBA\u53E3"
SkillName: "\u6797\u751F"
skillPriority: 0
skillPriority: 1
- SkillType: 110
SkillViewType: 0
SkillName: "\u6C34\u57DF\u901A\u884C"
@ -1529,7 +1529,7 @@ MonoBehaviour:
SkillIcon: {fileID: 21300000, guid: 63b59390646222b408b3dda1ee745db2, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0
skillPriority: 1
- SkillType: 179
SkillViewType: 1
SkillName: "\u5BB9\u514B\u519B\u5B98"
@ -1538,7 +1538,7 @@ MonoBehaviour:
SkillIcon: {fileID: 21300000, guid: e1233853c68bb5640b609296ecf51821, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0
skillPriority: 1
- SkillType: 148
SkillViewType: 2
SkillName: "\u79D1\u6280\u53D8\u9769\u4E4B\u795E"
@ -1675,15 +1675,6 @@ MonoBehaviour:
HasShowList: 0
SkillShowList: []
skillPriority: 0
- SkillType: 83
SkillViewType: 0
SkillName: "\u81EA\u7ED9\u81EA\u8DB3"
SkillDesc: "\u4E0D\u5360\u7528\u57CE\u5E02\u4EBA\u53E3"
NotShow: 0
SkillIcon: {fileID: 21300000, guid: 93238a210f97e2741a7db41fd4c93644, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0
- SkillType: 161
SkillViewType: 2
SkillName: "\u98CE\u795D"
@ -1978,12 +1969,12 @@ MonoBehaviour:
- SkillType: 210
SkillViewType: 3
SkillName: "\u6050\u60E7"
SkillDesc: "\u51CF\u5C1130%\u9632\u5FA1\u529B\uFF0C\u5927\u4E8E2\u5C42\u65F6\u53D1\u751F\u7206\u70B8\uFF0C\u5931\u53BB2\u5C42\uFF0C\u5BF9\u5468\u56F4\u9020\u6210\u4F24\u5BB3\u5E76\u4F20\u67D3**<\u6050\u60E7>**"
SkillDesc: "\u51CF\u5C1130%\u9632\u5FA1\u529B\uFF0C\u5927\u4E8E2\u5C42\u6216\u6B7B\u4EA1\u65F6\u53D1\u751F\u7206\u70B8\u5E76\u5931\u53BB\u5C42\u6570(\u81F3\u591A2\u5C42)\uFF0C\u5BF9\u5468\u56F4\u5355\u4F4D\u4F20\u67D3**<\u6050\u60E7>**\u3002\u82E5\u5355\u6B21\u5931\u53BB2\u5C42\u5219\u989D\u5916\u9020\u6210\u4F24\u5BB3\u3002\u5C42\u6570\u5927\u4E8E2\u5C42\u5C06\u989D\u5916\u9020\u6210\u4F24\u5BB3\u3002"
NotShow: 0
SkillIcon: {fileID: 21300000, guid: fe4d9ce677c34634f8f135bea67d2a3e, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0
skillPriority: 1
- SkillType: 211
SkillViewType: 2
SkillName: "\u8111\u6307\u7EB9"
@ -2010,7 +2001,7 @@ MonoBehaviour:
SkillIcon: {fileID: 21300000, guid: 717815cb183d0d740ac061169e3cf67f, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0
skillPriority: 1
- SkillType: 214
SkillViewType: 3
SkillName: "\u4E8C\u91CD\u9ED1\u6B7B\u8776"
@ -2019,7 +2010,7 @@ MonoBehaviour:
SkillIcon: {fileID: 21300000, guid: a718d5b9d0863e9438f829f596b366bc, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0
skillPriority: 1
- SkillType: 215
SkillViewType: 2
SkillName: "\u4E0D\u6B7B"
@ -2037,7 +2028,7 @@ MonoBehaviour:
SkillIcon: {fileID: 0}
HasShowList: 0
SkillShowList: []
skillPriority: 0
skillPriority: 1
- SkillType: 217
SkillViewType: 4
SkillName: "\u7C97\u949D\u8EAB"

135
Unity/Assets/Resources/Export/CultureCardDataAssets.asset Normal file
View File

@ -0,0 +1,135 @@
%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: d5d6d42f85fa1f149aa923d54f39b74c, type: 3}
m_Name: CultureCardDataAssets
m_EditorClassIdentifier:
CultureCardDataList:
- CardType: 1
CultureType: 1
IsActive: 1
Name: 18122
Description: 18123
Cost: 0
Icon: {fileID: 0}
RequiredTechs:
LimitedEmpires: []
PrerequisiteCards:
MaxCount: 1
Priority: 0
- CardType: 2
CultureType: 1
IsActive: 1
Name: 18124
Description: 18125
Cost: 0
Icon: {fileID: 0}
RequiredTechs:
LimitedEmpires: []
PrerequisiteCards:
MaxCount: 1
Priority: 0
- CardType: 3
CultureType: 2
IsActive: 1
Name: 18126
Description: 18128
Cost: 15
Icon: {fileID: 0}
RequiredTechs:
LimitedEmpires: []
PrerequisiteCards:
MaxCount: 1
Priority: 0
- CardType: 4
CultureType: 1
IsActive: 1
Name: 18129
Description: 18131
Cost: 30
Icon: {fileID: 0}
RequiredTechs:
LimitedEmpires: []
PrerequisiteCards:
MaxCount: 1
Priority: 0
- CardType: 5
CultureType: 1
IsActive: 1
Name: 18132
Description: 18134
Cost: 30
Icon: {fileID: 0}
RequiredTechs:
LimitedEmpires: []
PrerequisiteCards:
MaxCount: 1
Priority: 0
- CardType: 6
CultureType: 1
IsActive: 1
Name: 18135
Description: 18136
Cost: 60
Icon: {fileID: 0}
RequiredTechs:
LimitedEmpires: []
PrerequisiteCards:
MaxCount: 1
Priority: 0
- CardType: 7
CultureType: 1
IsActive: 1
Name: 18137
Description: 18139
Cost: 60
Icon: {fileID: 0}
RequiredTechs:
LimitedEmpires: []
PrerequisiteCards:
MaxCount: 1
Priority: 0
- CardType: 8
CultureType: 3
IsActive: 1
Name: 18140
Description: 18142
Cost: 0
Icon: {fileID: 0}
RequiredTechs:
LimitedEmpires: []
PrerequisiteCards:
MaxCount: 1
Priority: 0
- CardType: 9
CultureType: 3
IsActive: 1
Name: 18143
Description: 18145
Cost: 0
Icon: {fileID: 0}
RequiredTechs:
LimitedEmpires: []
PrerequisiteCards:
MaxCount: 1
Priority: 0
- CardType: 10
CultureType: 3
IsActive: 1
Name: 18146
Description: 18149
Cost: 0
Icon: {fileID: 0}
RequiredTechs:
LimitedEmpires: []
PrerequisiteCards:
MaxCount: 1
Priority: 0

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

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

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

@ -1404,7 +1404,7 @@ MonoBehaviour:
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 77
@ -7591,7 +7591,7 @@ MonoBehaviour:
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 446
@ -7609,7 +7609,7 @@ MonoBehaviour:
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 447
@ -26434,7 +26434,7 @@ MonoBehaviour:
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 1437
@ -357050,4 +357050,688 @@ MonoBehaviour:
IsSpecialTerm: 0
Color:
Icon:
- ID: 18112
ZH: "\u53F2\u8BD7\u7684\u4EA4\u6C47"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18113
ZH: "\u9700\u62E5\u6709"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18114
ZH: "\u53CC\u661F\u7684\u4EA4\u6C47"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18115
ZH: "\u9009\u62E9\u65B0\u7684\u51FA\u6218\u89D2\u8272"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18116
ZH: "\u6587\u5316\u503C\u4EFB\u52A1"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18117
ZH: "\u9996\u6B21\u62E5\u6709Lv.2\u82F1\u96C4"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18118
ZH: "\u5956\u52B1"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18119
ZH: "\u9996\u6B21\u62E5\u6709Lv.3\u82F1\u96C4"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18120
ZH: "\u5EFA\u6210\u5947\u89C2\u5EFA\u7B51"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18121
ZH: "\u6CD5\u5178"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18122
ZH: "\u6267\u653F\u5B98"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18123
ZH: "\u53EF\u51FA\u6218\u7B2C2\u540D\u82F1\u96C4"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18124
ZH: "\u4E09\u5934\u653F\u6CBB"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18125
ZH: "\u53EF\u51FA\u6218\u7B2C3\u540D\u82F1\u96C4"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18126
ZH: "\u6BCD\u6743\u4F20\u7EDF"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18127
ZH: "\u540E\u4E4B\u96D5\u50CF"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18128
ZH: "\u53EF\u5728**<1436>**\u4E2D\u5EFA\u9020**<18127>**"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18129
ZH: "\u5185\u9601\u5236"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18130
ZH: "\u76F8\u4E4B\u96D5\u50CF"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18131
ZH: "\u53EF\u5728**<446>**\u4E2D\u5EFA\u9020**<18130>**"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18132
ZH: "\u56FD\u5BB6\u8981\u585E"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18133
ZH: "\u8F66\u4E4B\u96D5\u50CF"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18134
ZH: "\u53EF\u5728**<1434>**\u4E2D\u5EFA\u9020**<18133>**"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18135
ZH: "\u541B\u6743\u795E\u6388"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18136
ZH: "\u53EF\u5728**<445>**\u4E2D\u5EFA\u9020**<18133>**"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18137
ZH: "\u6E38\u7267\u4F20\u7EDF"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18138
ZH: "\u9A6C\u4E4B\u96D5\u50CF"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18139
ZH: "\u53EF\u5728**<76>**\u4E2D\u5EFA\u9020**<18138>**"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18140
ZH: "\u5C01\u5EFA\u91C7\u9091"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18141
ZH: "\u6587\u5316\u503C"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18142
ZH: "\u82F1\u96C4\u5347\u7EA7\u6240\u9700**<18141>**\u6D88\u8017\u51CF\u5C1180%"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18143
ZH: "\u82F1\u7075\u5D07\u62DC"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18144
ZH: "\u5DE8\u4EBA\u5355\u4F4D"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18145
ZH: "\u53EF\u6D88\u8017**<18141>**\u8BAD\u7EC3**<18144>**"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18146
ZH: "\u4E07\u56FD\u535A\u89C8\u4F1A"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
- ID: 18147
ZH: "\u56DE\u5408\u91D1\u5E01"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18148
ZH: "\u56DE\u5408\u6587\u5316\u503C"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 1
Color:
Icon:
- ID: 18149
ZH: "**<18148>**\u63D0\u4F9B\u7B49\u91CF**<18147>**"
TDZH:
EN:
JP:
KR:
RU:
ES:
PT:
FR:
IsProperNoun: 0
IsDialogue: 0
DialogueSpeaker:
IsDeprecated: 0
IsCustom: 0
IsSpecialTerm: 0
Color:
Icon:
TargetTypes: 010000000200000003000000040000000500000006000000070000000800000009000000

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

@ -1086,7 +1086,7 @@ MonoBehaviour:
Icon: {fileID: 0}
SkillDesc: 1963
SkillName: 2068
skillPriority: 0
skillPriority: 1
- SkillType: 110
SkillViewType: 0
SkillName: 17239
@ -1524,7 +1524,7 @@ MonoBehaviour:
SkillIcon: {fileID: 21300000, guid: 63b59390646222b408b3dda1ee745db2, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0
skillPriority: 1
- SkillType: 179
SkillViewType: 1
SkillName: 16648
@ -1533,7 +1533,7 @@ MonoBehaviour:
SkillIcon: {fileID: 21300000, guid: e1233853c68bb5640b609296ecf51821, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0
skillPriority: 1
- SkillType: 148
SkillViewType: 2
SkillName: 16700
@ -1669,15 +1669,6 @@ MonoBehaviour:
HasShowList: 0
SkillShowList: []
skillPriority: 0
- SkillType: 83
SkillViewType: 0
SkillName: 2067
SkillDesc: 1963
NotShow: 0
SkillIcon: {fileID: 21300000, guid: 93238a210f97e2741a7db41fd4c93644, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0
- SkillType: 161
SkillViewType: 2
SkillName: 16747
@ -1977,7 +1968,7 @@ MonoBehaviour:
SkillIcon: {fileID: 21300000, guid: fe4d9ce677c34634f8f135bea67d2a3e, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0
skillPriority: 1
- SkillType: 211
SkillViewType: 2
SkillName: 18100
@ -2004,7 +1995,7 @@ MonoBehaviour:
SkillIcon: {fileID: 21300000, guid: 717815cb183d0d740ac061169e3cf67f, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0
skillPriority: 1
- SkillType: 214
SkillViewType: 3
SkillName: 17829
@ -2013,7 +2004,7 @@ MonoBehaviour:
SkillIcon: {fileID: 21300000, guid: a718d5b9d0863e9438f829f596b366bc, type: 3}
HasShowList: 0
SkillShowList: []
skillPriority: 0
skillPriority: 1
- SkillType: 215
SkillViewType: 2
SkillName: 17765
@ -2031,7 +2022,7 @@ MonoBehaviour:
SkillIcon: {fileID: 0}
HasShowList: 0
SkillShowList: []
skillPriority: 0
skillPriority: 1
- SkillType: 217
SkillViewType: 4
SkillName: 18062

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

@ -30,6 +30,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 2
Skills: 0800000002000000b6000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -157,6 +158,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 3
Skills: 020000000300000008000000b6000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -284,6 +286,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 3
Skills: 0200000008000000b6000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -411,6 +414,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 3
Skills: 08000000b6000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -538,6 +542,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 8
Skills: 020000000800000004000000b6000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -665,6 +670,7 @@ MonoBehaviour:
AttackRange: 3
Cost: 8
Skills: 07000000b6000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -792,6 +798,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 5
Skills: 02000000b6000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -919,6 +926,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 8
Skills: 0a0000000c0000000e00000006000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 0
SpriteList: []
@ -942,6 +950,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 5
Skills: 07000000090000000a000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -1069,6 +1078,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 2
Skills: 0b000000070000000d00000001000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -1196,6 +1206,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 5
Skills: 0b0000000c0000000d00000002000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -1323,6 +1334,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 5
Skills: 0b0000000d00000002000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -1450,6 +1462,7 @@ MonoBehaviour:
AttackRange: 3
Cost: 15
Skills: 0b000000050000000d00000007000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -1577,6 +1590,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 10
Skills: 0d000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -1704,6 +1718,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 15
Skills: 1c0000001b00000022000000290000002a00000001000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 0aa305c6fa2a1e347b1a1654e9916749, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -1727,6 +1742,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 15
Skills: 1c0000001b00000022000000290000002a00000001000000
ActionIds: []
Sprite: {fileID: 21300000, guid: bd7e07fc549ba8a46a4eb79a62f9090b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -1750,6 +1766,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 080000002b0000000d0000002000000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: a5f0d65989fcf8140b7434d09144f244, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -1773,6 +1790,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 080000002b0000000d000000200000008100000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: a5f0d65989fcf8140b7434d09144f244, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -1796,6 +1814,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 080000002b0000000d00000020000000810000008400000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: a5f0d65989fcf8140b7434d09144f244, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -1819,6 +1838,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 080000002b0000000d000000200000008b000000920000008400000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: a5f0d65989fcf8140b7434d09144f244, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -1842,6 +1862,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 0d00000020000000730000000200000074000000d0000000
ActionIds: []
Sprite: {fileID: 21300000, guid: bd7e07fc549ba8a46a4eb79a62f9090b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -1865,6 +1886,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 0d000000200000007a000000020000007500000074000000d0000000
ActionIds: []
Sprite: {fileID: 21300000, guid: bd7e07fc549ba8a46a4eb79a62f9090b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -1888,6 +1910,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 0d00000020000000020000007a0000007600000074000000d0000000
ActionIds: []
Sprite: {fileID: 21300000, guid: bd7e07fc549ba8a46a4eb79a62f9090b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -1911,6 +1934,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 0d000000200000007a00000002000000760000004700000074000000d0000000
ActionIds: []
Sprite: {fileID: 21300000, guid: bd7e07fc549ba8a46a4eb79a62f9090b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -1934,6 +1958,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0d000000200000000c00000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 869a247f7a81bff4c872f47d8e8e9cfe, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -1957,6 +1982,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0d00000020000000020000000c0000006f000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 869a247f7a81bff4c872f47d8e8e9cfe, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -1980,6 +2006,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0d00000020000000020000000c0000006f00000071000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 869a247f7a81bff4c872f47d8e8e9cfe, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -2003,6 +2030,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0d00000020000000020000000c0000007200000071000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 869a247f7a81bff4c872f47d8e8e9cfe, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -2026,6 +2054,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0d00000020000000020000002b000000
ActionIds: []
Sprite: {fileID: 21300000, guid: f4a89946e6d83f5498b8da8784d65ac4, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -2049,6 +2078,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0d000000200000000200000004000000850000002b000000
ActionIds: []
Sprite: {fileID: 21300000, guid: f4a89946e6d83f5498b8da8784d65ac4, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -2072,6 +2102,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0d00000020000000020000000400000085000000860000002b000000
ActionIds: []
Sprite: {fileID: 21300000, guid: f4a89946e6d83f5498b8da8784d65ac4, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -2095,6 +2126,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0d00000027000000020000000400000085000000860000002b000000
ActionIds: []
Sprite: {fileID: 21300000, guid: f4a89946e6d83f5498b8da8784d65ac4, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -2118,6 +2150,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0d000000200000000200000013000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 82b5cf2ca68e54d4ba986589c3e86efd, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -2141,6 +2174,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0d0000002000000002000000130000007d000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 82b5cf2ca68e54d4ba986589c3e86efd, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -2164,6 +2198,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0d0000002000000002000000130000007d0000007e000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 82b5cf2ca68e54d4ba986589c3e86efd, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -2187,6 +2222,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0d0000002000000002000000130000007d0000007e0000007f000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 82b5cf2ca68e54d4ba986589c3e86efd, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -2210,6 +2246,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 070000000b0000000d000000
ActionIds: []
Sprite: {fileID: 0}
IsSpriteVarient: 1
SpriteList:
@ -2363,6 +2400,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 070000000b0000000d000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 82b5cf2ca68e54d4ba986589c3e86efd, type: 3}
IsSpriteVarient: 1
SpriteList:
@ -2516,6 +2554,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 070000000b0000000d000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 82b5cf2ca68e54d4ba986589c3e86efd, type: 3}
IsSpriteVarient: 1
SpriteList:
@ -2669,6 +2708,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 070000000b0000000d00000013000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 82b5cf2ca68e54d4ba986589c3e86efd, type: 3}
IsSpriteVarient: 1
SpriteList:
@ -2822,6 +2862,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 070000000b0000000d00000013000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 82b5cf2ca68e54d4ba986589c3e86efd, type: 3}
IsSpriteVarient: 1
SpriteList:
@ -2897,6 +2938,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 070000000b0000000d00000013000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 82b5cf2ca68e54d4ba986589c3e86efd, type: 3}
IsSpriteVarient: 1
SpriteList:
@ -2972,6 +3014,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 2
Skills: 020000000d000000080000005100000053000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 2b6657e73a55aea4d803ed1a276bd05c, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -2995,6 +3038,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 02000000030000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 7e5873fda33bd92468d7c7e9d7356112, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3018,6 +3062,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 0200000003000000630000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 7e5873fda33bd92468d7c7e9d7356112, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3041,6 +3086,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 020000000300000063000000640000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 7e5873fda33bd92468d7c7e9d7356112, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3064,6 +3110,7 @@ MonoBehaviour:
AttackRange: 3
Cost: 0
Skills: 020000000300000065000000640000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 7e5873fda33bd92468d7c7e9d7356112, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3087,6 +3134,7 @@ MonoBehaviour:
AttackRange: 3
Cost: 0
Skills: 020000000d000000200000000c00000003000000
ActionIds: []
Sprite: {fileID: 21300000, guid: b726d8d6bc92ae54e90e8e32457c53d1, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3110,6 +3158,7 @@ MonoBehaviour:
AttackRange: 3
Cost: 0
Skills: 0200000051000000590000000d000000200000000c00000003000000
ActionIds: []
Sprite: {fileID: 21300000, guid: b726d8d6bc92ae54e90e8e32457c53d1, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3133,6 +3182,7 @@ MonoBehaviour:
AttackRange: 3
Cost: 0
Skills: 0200000051000000590000005a0000000d000000200000000c00000003000000
ActionIds: []
Sprite: {fileID: 21300000, guid: b726d8d6bc92ae54e90e8e32457c53d1, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3156,6 +3206,7 @@ MonoBehaviour:
AttackRange: 3
Cost: 0
Skills: 0200000051000000590000005a0000005b0000000d000000200000000c00000003000000
ActionIds: []
Sprite: {fileID: 21300000, guid: b726d8d6bc92ae54e90e8e32457c53d1, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3179,6 +3230,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 020000000c000000540000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 64c12350da3f8f7488ea4585bac25d7a, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3202,6 +3254,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 020000000c00000054000000550000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 64c12350da3f8f7488ea4585bac25d7a, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3225,6 +3278,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 020000000c000000540000005500000056000000570000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 64c12350da3f8f7488ea4585bac25d7a, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3248,6 +3302,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 020000000c00000054000000550000005600000057000000580000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 64c12350da3f8f7488ea4585bac25d7a, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3271,6 +3326,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 02000000510000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 523c2b2d5f317d649939a184e79b9d5e, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3294,6 +3350,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 0200000051000000670000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 523c2b2d5f317d649939a184e79b9d5e, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3317,6 +3374,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 020000005100000067000000680000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 523c2b2d5f317d649939a184e79b9d5e, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3340,6 +3398,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 020000005100000067000000680000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 523c2b2d5f317d649939a184e79b9d5e, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3363,6 +3422,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 020000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 626b0c5255680844094c67732e660d56, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3386,6 +3446,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 020000005c0000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 626b0c5255680844094c67732e660d56, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3409,6 +3470,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 020000005c0000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 626b0c5255680844094c67732e660d56, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3432,6 +3494,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 020000005c000000610000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 626b0c5255680844094c67732e660d56, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3455,6 +3518,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 010000005d00000013000000070000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: ba2179d33a9a2a74e995c36f03d22291, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3478,6 +3542,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 010000005d00000013000000070000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: ba2179d33a9a2a74e995c36f03d22291, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3501,6 +3566,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 010000005d00000013000000070000000d00000020000000
ActionIds: []
Sprite: {fileID: 21300000, guid: ba2179d33a9a2a74e995c36f03d22291, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3524,6 +3590,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 02000000660000000d000000510000006d00000053000000ce000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 1f47e26fbd7a1a54ebcd89c6d630e38c, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3547,6 +3614,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 02000000660000000d000000510000006d00000053000000ce000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 1f47e26fbd7a1a54ebcd89c6d630e38c, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3570,6 +3638,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 02000000690000000d00000051000000670000006d00000053000000ce000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 1f47e26fbd7a1a54ebcd89c6d630e38c, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3593,6 +3662,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 10
Skills: 0d0000006c000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 5c7c1475d54f2b8498986fb8e659771b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3616,6 +3686,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 10
Skills: 0d0000008c0000008d000000020000008f000000
ActionIds: []
Sprite: {fileID: 21300000, guid: c0512bc3a8974e54d97b4f0e1581ad7c, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3639,6 +3710,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 10
Skills: 0d0000008d00000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 2f3b34e7bfcc4c346bcb967c78511606, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3662,6 +3734,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 3
Skills: 93000000020000000300000008000000b3000000
ActionIds: []
Sprite: {fileID: 21300000, guid: d1218fb75bc29a4408e5906e4c4ca29b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3685,6 +3758,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 8
Skills: 020000000800000004000000b3000000b4000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 78dd5cd3e83e0b144aac0814b94a6799, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3708,6 +3782,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 02000000200000009400000096000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 40858c020e180bb40a335f460c4a1d70, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3731,6 +3806,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 02000000200000009400000096000000b80000009a00000095000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 40858c020e180bb40a335f460c4a1d70, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3754,6 +3830,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 02000000200000009400000096000000b9000000b700000095000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 40858c020e180bb40a335f460c4a1d70, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3777,6 +3854,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 02000000200000009400000096000000b9000000b700000095000000c0000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 40858c020e180bb40a335f460c4a1d70, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3800,6 +3878,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 020000000c000000200000009b0000009c000000
ActionIds: []
Sprite: {fileID: 21300000, guid: cb8459c31c131994e987d4fc1c0fd8bd, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3823,6 +3902,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 020000000c000000200000009b0000009c000000ba000000
ActionIds: []
Sprite: {fileID: 21300000, guid: cb8459c31c131994e987d4fc1c0fd8bd, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3846,6 +3926,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 020000000c000000200000009b0000009c000000ba000000bb000000
ActionIds: []
Sprite: {fileID: 21300000, guid: cb8459c31c131994e987d4fc1c0fd8bd, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3869,6 +3950,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 020000000c000000200000009b0000009c000000ba000000bb000000bc000000
ActionIds: []
Sprite: {fileID: 21300000, guid: cb8459c31c131994e987d4fc1c0fd8bd, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3892,6 +3974,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 0200000020000000030000000c000000a1000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 44cf6a6ef01989f428d8ff088eba71d9, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3915,6 +3998,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 0200000020000000030000000c000000a1000000a0000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 44cf6a6ef01989f428d8ff088eba71d9, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3938,6 +4022,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 0200000020000000030000000c000000a1000000a0000000a3000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 44cf6a6ef01989f428d8ff088eba71d9, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3961,6 +4046,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 0200000020000000030000000c000000a1000000a0000000a3000000a4000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 44cf6a6ef01989f428d8ff088eba71d9, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -3984,6 +4070,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 02000000030000002000000093000000
ActionIds: []
Sprite: {fileID: 21300000, guid: b1854ebad9f229141a76927890e12b05, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4007,6 +4094,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 020000000300000020000000c1000000a600000093000000
ActionIds: []
Sprite: {fileID: 21300000, guid: b1854ebad9f229141a76927890e12b05, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4030,6 +4118,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 020000000300000020000000c1000000a6000000a700000093000000
ActionIds: []
Sprite: {fileID: 21300000, guid: b1854ebad9f229141a76927890e12b05, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4053,6 +4142,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 020000000300000020000000c1000000a6000000a7000000a800000093000000
ActionIds: []
Sprite: {fileID: 21300000, guid: b1854ebad9f229141a76927890e12b05, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4076,6 +4166,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0200000020000000a9000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 9c71f8e8458387f4c993a28beba5b386, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4099,6 +4190,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0200000020000000a9000000aa000000ac00000006000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 9c71f8e8458387f4c993a28beba5b386, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4122,6 +4214,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0200000020000000a9000000aa000000ac000000ad00000006000000d1000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 9c71f8e8458387f4c993a28beba5b386, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4145,6 +4238,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 0200000020000000a9000000aa000000ac000000ad000000ae00000006000000d1000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 9c71f8e8458387f4c993a28beba5b386, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4168,6 +4262,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 20000000e000000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 08db2adc08231e842ba71741b9f3fb3b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4191,6 +4286,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 20000000e0000000d300000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 08db2adc08231e842ba71741b9f3fb3b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4214,6 +4310,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 20000000e0000000d3000000d400000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 08db2adc08231e842ba71741b9f3fb3b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4237,6 +4334,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 20000000e0000000d3000000d4000000f200000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 08db2adc08231e842ba71741b9f3fb3b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4260,6 +4358,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 20000000db0000000c000000dc00000003000000e100000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: f3c529d92a9946745825639f7bf74554, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4283,6 +4382,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 20000000db0000000c000000dc000000030000001d000000e100000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: f3c529d92a9946745825639f7bf74554, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4306,6 +4406,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 20000000db0000000c000000dc00000003000000dd0000001d000000e1000000e200000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: f3c529d92a9946745825639f7bf74554, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4329,10 +4430,11 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 20000000db0000000c000000dc00000003000000dd0000001d000000e1000000e200000002000000
ActionIds: []
Sprite: {fileID: 21300000, guid: f3c529d92a9946745825639f7bf74554, type: 3}
IsSpriteVarient: 0
SpriteList: []
ProjectileType: 14
ProjectileType: 1
ForceMelee: 0
SameUnitCountLimit: 4
- UnitType: 14
@ -4352,6 +4454,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 20000000e3000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 91b74550ff01e84408d84d19f41f0855, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4375,6 +4478,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 20000000e3000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 91b74550ff01e84408d84d19f41f0855, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4398,6 +4502,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 20000000e3000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 91b74550ff01e84408d84d19f41f0855, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4421,6 +4526,7 @@ MonoBehaviour:
AttackRange: 2
Cost: 0
Skills: 20000000e3000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 91b74550ff01e84408d84d19f41f0855, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4444,6 +4550,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 20000000e5000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 2402fd4a0df809349bab2260b42a3d5b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4467,6 +4574,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 20000000e5000000e7000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 2402fd4a0df809349bab2260b42a3d5b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4490,6 +4598,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 20000000e5000000e7000000e9000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 2402fd4a0df809349bab2260b42a3d5b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4513,6 +4622,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 20000000e5000000e7000000e9000000ea000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 2402fd4a0df809349bab2260b42a3d5b, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4536,6 +4646,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 20000000eb000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 73ae037f4b5dab74caa7b0457186a8a6, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4559,6 +4670,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 20000000eb000000ec000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 73ae037f4b5dab74caa7b0457186a8a6, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4582,6 +4694,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 20000000eb000000ec000000ed000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 73ae037f4b5dab74caa7b0457186a8a6, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4605,6 +4718,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 0
Skills: 20000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 73ae037f4b5dab74caa7b0457186a8a6, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4628,6 +4742,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 2
Skills: 020000009300000003000000bf00000053000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 28e6460db24cf4a45b7b9371c09d5860, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4651,6 +4766,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 5
Skills: 020000009300000003000000bf00000053000000
ActionIds: []
Sprite: {fileID: 21300000, guid: fd2707d83a9cfaf42a3b358245a243a8, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4674,6 +4790,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 10
Skills: 0200000093000000bf0000005300000003000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 6ee1ea111ce0dc34db417b8e08b238b4, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4697,6 +4814,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 24
Skills: 0200000093000000bf00000053000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 3ce5d777d146e044db496bffc40e6d0c, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4720,6 +4838,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 50
Skills: 0200000093000000bf00000053000000
ActionIds: []
Sprite: {fileID: 21300000, guid: fa30bcf9a46819140baf5ebd9fd93279, type: 3}
IsSpriteVarient: 0
SpriteList: []
@ -4743,6 +4862,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 10
Skills: 0d00000007000000130000000b000000
ActionIds: []
Sprite: {fileID: 21300000, guid: c1790be039b73f040b367eb070061427, type: 3}
IsSpriteVarient: 1
SpriteList:
@ -4870,6 +4990,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 10
Skills: 0d00000007000000130000000b000000
ActionIds: []
Sprite: {fileID: 21300000, guid: a27366cf9abc0e948b48123d47958c84, type: 3}
IsSpriteVarient: 1
SpriteList:
@ -4997,6 +5118,7 @@ MonoBehaviour:
AttackRange: 1
Cost: 10
Skills: 0b0000000100000007000000
ActionIds: []
Sprite: {fileID: 21300000, guid: 8d642fe2c85bf0b49a73ad8d304f5374, type: 3}
IsSpriteVarient: 0
SpriteList: []

77
Unity/Assets/Resources/Prefab/UI/Info/UIInfoCommonBaseSkillCircle.prefab
View File

@ -134,6 +134,81 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &783820221336700758
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4692718588366253042}
- component: {fileID: 4776507378766314797}
- component: {fileID: 1476786529346346976}
m_Layer: 5
m_Name: Ban
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4692718588366253042
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783820221336700758}
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: 6003267594867130460}
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: 0, y: 0}
m_SizeDelta: {x: 37.3786, y: 37.3786}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4776507378766314797
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783820221336700758}
m_CullTransparentMesh: 1
--- !u!114 &1476786529346346976
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783820221336700758}
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.6289307, g: 0.6289307, b: 0.6289307, 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: b6fabf0143719d3429e19cc54ae4b31e, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1215931183778596865
GameObject:
m_ObjectHideFlags: 0
@ -455,6 +530,7 @@ RectTransform:
- {fileID: 1393707766859885621}
- {fileID: 534760870720527863}
- {fileID: 5658816432037172145}
- {fileID: 4692718588366253042}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -485,6 +561,7 @@ MonoBehaviour:
HintTrigger: {fileID: 6164224945701174129}
SkillIcon: {fileID: 3148148894576011886}
SkillIconBG: {fileID: 3530477774206838960}
BanImage: {fileID: 1476786529346346976}
SkillLevelArea: {fileID: 9142317363711528157}
SkillTimeArea: {fileID: 6484351529668882728}
SkillLevelText: {fileID: 2394356323231752857}

6
Unity/Assets/Resources/Prefab/UI/Info/UIInfoCultureCard.prefab
View File

@ -150,7 +150,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 16658
ID: 18112
FontID: 1
TextCfg:
- Type: 1
@ -523,7 +523,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 16658
ID: 18113
FontID: 1
TextCfg:
- Type: 1
@ -697,7 +697,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 16658
ID: 18114
FontID: 1
TextCfg:
- Type: 1

18
Unity/Assets/Resources/Prefab/UI/Info/UIInfoHero.prefab
View File

@ -151,7 +151,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 16656
ID: 18116
FontID: 2
TextCfg:
- Type: 1
@ -466,7 +466,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 16658
ID: 18120
FontID: 1
TextCfg:
- Type: 1
@ -2335,7 +2335,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 2493
ID: 18118
FontID: 2
TextCfg:
- Type: 1
@ -4811,7 +4811,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 16665
ID: 18115
FontID: 2
TextCfg:
- Type: 1
@ -4970,7 +4970,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 16658
ID: 18119
FontID: 1
TextCfg:
- Type: 1
@ -5129,7 +5129,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 2493
ID: 18118
FontID: 2
TextCfg:
- Type: 1
@ -5424,7 +5424,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 16658
ID: 18117
FontID: 1
TextCfg:
- Type: 1
@ -6400,7 +6400,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 16656
ID: 18121
FontID: 2
TextCfg:
- Type: 1
@ -7609,7 +7609,7 @@ MonoBehaviour:
Ban: 0
NoExport: 0
FontBan: 0
ID: 2493
ID: 18118
FontID: 2
TextCfg:
- Type: 1

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

@ -199,6 +199,7 @@ MonoBehaviour:
SuperDefense: {fileID: 6879767484323616087}
UnitInfoName: {fileID: 5648530559652216814}
InfoGroup: {fileID: 125257996137627304}
HideAround: {fileID: 6396779587332902180}
StatusAreaContainer: {fileID: 4128611394455241087}
StatusIconPrefab: {fileID: 3019578617163145481, guid: e56989dd6da795d47b8a070582368a93, type: 3}
UnitBGBlue: {r: 0.20392157, g: 0.23529412, b: 0.45882353, a: 1}
@ -1839,6 +1840,102 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8708106100276973736
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1983348263031435320}
- component: {fileID: 2472542695263494903}
- component: {fileID: 1208994516248119073}
- component: {fileID: 6396779587332902180}
m_Layer: 5
m_Name: HideAround
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1983348263031435320
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8708106100276973736}
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: 1774352506934932859}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0.04, y: -0.56}
m_SizeDelta: {x: 1.0565, y: 1.1801}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2472542695263494903
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8708106100276973736}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!222 &1208994516248119073
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8708106100276973736}
m_CullTransparentMesh: 1
--- !u!114 &6396779587332902180
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8708106100276973736}
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: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 36cfab88013f1364b989d84ff18001f8, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8866165466489377965
GameObject:
m_ObjectHideFlags: 0
@ -1959,6 +2056,7 @@ RectTransform:
- {fileID: 2039140282101271741}
- {fileID: 125257996137627304}
- {fileID: 4102536899355370618}
- {fileID: 1983348263031435320}
- {fileID: 5486925947546565595}
- {fileID: 5256187714372016346}
- {fileID: 4648123304325160400}

BIN
Unity/Assets/Resources/TH1UI/Icon/CommonIcon/SkillBan.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

114
Unity/Assets/Resources/TH1UI/Icon/CommonIcon/SkillBan.png.meta Normal file
View File

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

8
Unity/Assets/Resources/TH1UI/Icon/Emoji.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 152db2e8c6b4d5243a09693a99976490
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Unity/Assets/Resources/TH1UI/Icon/Emoji/emoji_coin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

114
Unity/Assets/Resources/TH1UI/Icon/Emoji/emoji_coin.png.meta Normal file
View File

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

BIN
Unity/Assets/Resources/TH1UI/Icon/Emoji/emoji_culture.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

114
Unity/Assets/Resources/TH1UI/Icon/Emoji/emoji_culture.png.meta Normal file
View File

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

BIN
Unity/Assets/Resources/TH1UI/Icon/Emoji/emoji_tech.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

114
Unity/Assets/Resources/TH1UI/Icon/Emoji/emoji_tech.png.meta Normal file
View File

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

2
Unity/Assets/Scenes/SampleScene.unity
View File

@ -8910,7 +8910,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2201847644127865664, guid: a309306545f51af448ade9f87b0dd481, type: 3}
propertyPath: m_AnchoredPosition.y
value: -8.823425
value: -8.823364
objectReference: {fileID: 0}
- target: {fileID: 2201847644127865664, guid: a309306545f51af448ade9f87b0dd481, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

12
Unity/Assets/Scripts/TH1_Anim/Fragments/FragmentData.cs
View File

@ -46,10 +46,10 @@ namespace TH1_Anim
return null;
}
public static IFragmentData Create(FragmentType type,UnitRenderer originUnitRenderer,UnitRenderer targetUnitRenderer,GridData originGrid,GridData targetGrid,ProjectileType attack,ProjectileType counter,int attackDmg,int counterDmg,CityData originCity,CityData targetCity)
public static IFragmentData Create(FragmentType type,UnitRenderer originUnitRenderer,UnitRenderer targetUnitRenderer,GridData originGrid,GridData targetGrid,ProjectileType attack,ProjectileType counter,int attackDmg,int counterDmg,CityData originCity,CityData targetCity, bool targetCanNotBeKilled = false)
{
if(type is FragmentType.Attack or FragmentType.AttackAndCounter or FragmentType.MoveKill or FragmentType.NotMoveKill or FragmentType.AttackAndCounterDie)
return new FragmentAttackAndCounterData(type,originUnitRenderer,targetUnitRenderer,originGrid,targetGrid,attack,counter,attackDmg,counterDmg,originCity,targetCity);
return new FragmentAttackAndCounterData(type,originUnitRenderer,targetUnitRenderer,originGrid,targetGrid,attack,counter,attackDmg,counterDmg,originCity,targetCity,targetCanNotBeKilled);
Debug.Log("错误的fragmentType fragmentData创建失败！#3");
return null;
}
@ -165,8 +165,9 @@ namespace TH1_Anim
public ProjectileType CounterType;
public int AttackDmg;
public int CounterDmg;
public FragmentAttackAndCounterData(FragmentType type,UnitRenderer originUnitRenderer,UnitRenderer targetUnitRenderer,GridData originGrid, GridData targetGrid, ProjectileType attack,ProjectileType counter,int attackDmg, int counterDmg,CityData originCity,CityData targetCity) : base(type)
public bool TargetCanNotBeKilled;
public FragmentAttackAndCounterData(FragmentType type,UnitRenderer originUnitRenderer,UnitRenderer targetUnitRenderer,GridData originGrid, GridData targetGrid, ProjectileType attack,ProjectileType counter,int attackDmg, int counterDmg,CityData originCity,CityData targetCity, bool targetCanNotBeKilled = false) : base(type)
{
OriginUnitRenderer = originUnitRenderer;
TargetUnitRenderer = targetUnitRenderer;
@ -178,8 +179,9 @@ namespace TH1_Anim
CounterType = counter;
AttackDmg = attackDmg;
CounterDmg = counterDmg;
TargetCanNotBeKilled = targetCanNotBeKilled;
}
}
public class FragmentGridUpdateData : IFragmentData

3
Unity/Assets/Scripts/TH1_Anim/Fragments/FragmentMoveKill.cs
View File

@ -94,7 +94,8 @@ namespace TH1_Anim.Fragments
Data.TargetGrid.Renderer(Main.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Hurt));
Data.TargetGrid.Renderer(Main.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Fog));
Data.TargetGrid.Renderer(Main.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Die));
if (!Data.TargetCanNotBeKilled)
Data.TargetGrid.Renderer(Main.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Die));
Data.TargetGrid.Renderer(Main.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Damage,Data.AttackDmg));
Data.OriginGrid.Renderer(Main.MapData)?.InstantUpdateGrid();

3
Unity/Assets/Scripts/TH1_Anim/Fragments/FragmentNotMoveKill.cs
View File

@ -93,7 +93,8 @@ namespace TH1_Anim.Fragments
//播放特效
Data.TargetGrid.Renderer(Main.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Hurt));
Data.TargetGrid.Renderer(Main.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Fog));
Data.TargetGrid.Renderer(Main.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Die));
if (!Data.TargetCanNotBeKilled)
Data.TargetGrid.Renderer(Main.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Die));
Data.TargetGrid.Renderer(Main.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Damage,Data.AttackDmg));
//如果是近战，做一个返回动画
if (_attackInfo.ProjectileType == ProjectileType.Melee)

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

@ -541,7 +541,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.BeforeTurnStart();
if (skill.IsFinished())
{
@ -559,7 +559,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.OnAfterTurnStart(this, map);
}
}
@ -570,7 +570,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.OnTurnEnd(this, map);
}
}
@ -582,7 +582,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
v += skill.GetExtraSight(this,map);
}
if (map.GetGridDataByUnitId(this.Id, out var grid) && grid.Feature == TerrainFeature.Mountain)
@ -597,7 +597,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
v += skill.GetExtraSight(this,map);
}
if (grid.Feature == TerrainFeature.Mountain)
@ -611,7 +611,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
attackRange += skill.GetExtraAttackRange(mapData,this);
}
@ -629,7 +629,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (!skill.GetFinalMoveRange(this, out var finalMoveRange)) continue;
return finalMoveRange;
}
@ -647,7 +647,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
moveRange += skill.GetExtraMoveRange(mapData,this);
}
@ -661,7 +661,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsLimitSelfExp(this, map)) isStaticExp = true;
}
@ -690,7 +690,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
value *= skill.GetSpecialSkillBonus(mapData, this, skillType);
}
return value;
@ -734,7 +734,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
value += skill.GetAttackAdditionParam(map, this, target);
}
return value;
@ -747,7 +747,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
value *= skill.GetAttackMultiplicationParam(map, this, target);
}
return value;
@ -775,7 +775,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
add += skill.GetExtraMoveRange(mapData,this);
}
//var mul = GetDefenseMultiplicationParam(map);
@ -802,7 +802,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
add += skill.GetExtraAttackRange(mapData,this);
}
//var mul = GetDefenseMultiplicationParam(map);
@ -837,7 +837,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
value += skill.GetDefenseAdditionParam(map, this, target);
}
return value;
@ -853,7 +853,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
var t = skill.GetDefenseMultiplicationParam(map, this, target);
isZero *= t;
@ -887,7 +887,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
var t = skill.GetDefenseMultiplicationParam(map, this, target);
isZero *= t;
@ -936,7 +936,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
criticalHitRate += skill.GetCriticalHitRate(this, map);
}
return criticalHitRate;
@ -959,7 +959,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
ret += skill.GetOfficerHealth();
}
return ret;
@ -971,7 +971,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsOfficer()) return true;
}
return false;
@ -982,7 +982,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsPrepareOfficer()) return true;
}
return false;
@ -994,7 +994,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsCanBeOfficer()) return true;
}
return false;
@ -1006,7 +1006,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsCanMoveGiantNearbyGrid(this, map)) return true;
}
return false;
@ -1032,7 +1032,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsCanMoveToNoUnitSelfCity(this, map)) return true;
}
return false;
@ -1044,7 +1044,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (!skill.IsCanBeKill(this, map)) return false;
}
return true;
@ -1056,7 +1056,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsLimitDamaged(this, map, dmg)) return true;
}
return false;
@ -1068,7 +1068,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsLimitSelfExp(this, map)) return true;
}
return false;
@ -1086,7 +1086,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsCanMoveOnTerrain(this, map, terrainType)) return true;
}
return false;
@ -1100,7 +1100,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsCanMoveOnFeature(this, map,featureType)) return true;
}
return false;
@ -1112,7 +1112,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.CanAttackAll(this, map)) return true;
}
return false;
@ -1124,7 +1124,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsHideState()) return true;
}
return false;
@ -1145,7 +1145,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsLimitSelfAttack(this, map)) return true;
}
return false;
@ -1157,7 +1157,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsLimitSelfMove(this, map)) return true;
}
return false;
@ -1169,7 +1169,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsCanAttackTargetGrid(map,this,target)) return true;
}
return false;
@ -1181,7 +1181,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsCanAttackAlly()) return true;
}
return false;
@ -1193,7 +1193,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (!skill.IsCanAttackTargetAlly(map,this,target)) return false;
}
return true;
@ -1205,7 +1205,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsLimitSelfCounterAttack(this, map)) return true;
}
return false;
@ -1217,7 +1217,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsLimitTargetCounterAttack(this, map)) return true;
}
return false;
@ -1228,7 +1228,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsCanTransport()) return true;
}
return false;
@ -1240,7 +1240,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.ActiveMoveFailed(this, target, map, moveType, path)) return true;
}
@ -1254,7 +1254,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.BeforeMove(this, target, map, moveType, path);
}
}
@ -1266,7 +1266,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.OnMove(this, target, map,moveType, path);
}
//赋予格子特殊效果,scarletEmpire的单位走到格子上时会得到被赋予一个技能realTimeVampire
@ -1284,7 +1284,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.OnBeInteractTarget(origin, this, target, map);
}
}
@ -1296,7 +1296,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.BeforeDamagedSupportStage(map, info);
}
}
@ -1308,7 +1308,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.BeforeDamagedTransformStage(map, info);
}
}
@ -1321,7 +1321,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.BeforeActiveAttackOther(mapData, origin, target, out var tmpAddDmg);
addDmg += tmpAddDmg;
}
@ -1334,7 +1334,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.AfterActiveAttackOther(mapData, attackInfo);
}
}
@ -1346,7 +1346,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.AfterActiveAttacked(mapData, attackInfo);
}
}
@ -1358,7 +1358,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.BeforeDamageOther(map, info);
}
}
@ -1370,7 +1370,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.OnDamaged(mapData, info);
}
}
@ -1382,7 +1382,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.OnDamageOther(mapData, info);
}
}
@ -1394,7 +1394,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.AfterDamageOther(mapData, info);
}
}
@ -1406,7 +1406,7 @@ namespace RuntimeData
var copy = new List<SkillBase>(Skills);
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.OnHealOther(mapData,this,target, healType);
}
//HeroTask(mapData)?.OnDamageOther(mapData, info);
@ -1422,7 +1422,7 @@ namespace RuntimeData
float ret = 0f;
foreach (var skill in copy)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
ret = Mathf.Max(ret,skill.GetGridMoveFloor(mapData,originUnit,targetGrid));
}
return ret;
@ -1442,7 +1442,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
ret += skill.GetKillCount();
}
return ret;
@ -1463,7 +1463,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsTreatAsHero(map, this,unit)) return true;
}
return false;
@ -1475,7 +1475,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsLimitMoveToSelfTerrain(this, map)) return true;
}
return false;
@ -1487,7 +1487,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
if (skill.IsIgnoreZOC()) return true;
}
return false;
@ -1513,7 +1513,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.OnRefresh();
}
}
@ -1530,7 +1530,7 @@ namespace RuntimeData
var isFrozen = IsFrozen();
foreach (var skill in Skills)
{
if (isFrozen && skill.SkillPriority == SkillPriority.Normal) continue;
if (isFrozen && IsSkillFrozenFilter(skill)) continue;
skill.SetOfficer();
}
}
@ -1545,6 +1545,19 @@ namespace RuntimeData
return false;
}
//用于筛选哪些skill能被ban 哪些不能被ban
public bool IsSkillFrozenFilter(SkillBase skill)
{
return skill.SkillPriority == SkillPriority.Normal;
return false;
}
public bool IsSkillFrozenForSkillBase(SkillBase skill)
{
return IsFrozen() && IsSkillFrozenFilter(skill);
}
// 增加
public void AddActionPoint(ActionPointType actionPointType)
{

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

@ -1820,6 +1820,7 @@ namespace Logic.Action
}
//Step #2 处理逻辑计算，提前存储anim使用到的数据
bool targetCanNotBeKilled = !actionParams.TargetUnitData.CanBeKilled(actionParams.MapData);
Main.UnitLogic.Attack(actionParams.MapData, actionParams.UnitData, actionParams.TargetUnitData, out var attackDmg,out var counterDmg,out var fragmentType);
@ -1838,7 +1839,7 @@ namespace Logic.Action
FragmentType.Attack or FragmentType.AttackAndCounter or FragmentType.MoveKill or FragmentType.NotMoveKill or FragmentType.AttackAndCounterDie
=> FragmentDataFactory.Create(fragmentType, originUnitRenderer,
targetUnitRenderer, originGrid, targetGrid, originUnitProjectileType, targetUnitProjectileType, attackDmg,
counterDmg,originCity,targetCity),
counterDmg,originCity,targetCity,targetCanNotBeKilled),
_ => null
};
var fragment = FragmentFactory.Create(fragmentType,data);

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

@ -852,7 +852,8 @@ namespace Logic.Action
}
else
{
settle.DamageTargetGrid.Renderer(actionParams.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Die));
if (targetUnit == null || targetUnit.CanBeKilled(actionParams.MapData))
settle.DamageTargetGrid.Renderer(actionParams.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Die));
settle.DamageTargetGrid.Renderer(actionParams.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Hurt));
settle.DamageTargetGrid.Renderer(actionParams.MapData)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Fog));
targetUnit?.Renderer(actionParams.MapData)?.Die();

12
Unity/Assets/Scripts/TH1_Logic/Skill/AllSkill/SanaeDivineSkill.cs
View File

@ -228,11 +228,12 @@ namespace Logic.Skill
var map = mapData;
var tmpGrid = round;
var dmg = sameUnion ? _bigUnluckyFriendDmg : _bigUnluckyEnemyDmg;
var canBeKilled = unit.CanBeKilled(mapData);
var dmgInfo = Main.UnitLogic.DamageSettlement(mapData, originUnit, unit, dmg , sameUnion ? DamageType.KillSelf : DamageType.Splash);
//处理视觉
if (dmgInfo.DamageTargetGrid.InMainSight())
{
Timer.Instance.TimerRegister(this, () =>
{
tmpGrid.Renderer(map)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Hurt));
@ -240,7 +241,8 @@ namespace Logic.Skill
if (dmgInfo.IsKill)
{
tmpGrid.Renderer(map)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Fog));
tmpGrid.Renderer(map)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Die));
if (canBeKilled)
tmpGrid.Renderer(map)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Die));
}
unit.Renderer(map)?.InstantUpdateUnit(showoff: true);
@ -266,11 +268,12 @@ namespace Logic.Skill
//处理敌人
if (!sameUnion)
{
var canBeKilled = unit.CanBeKilled(mapData);
var dmgInfo = Main.UnitLogic.DamageSettlement(mapData, originUnit, unit, _bigLuckyDmg , DamageType.Splash);
//处理视觉
if (dmgInfo.DamageTargetGrid.InMainSight())
{
Timer.Instance.TimerRegister(this, () =>
{
tmpGrid.Renderer(map)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Hurt));
@ -278,7 +281,8 @@ namespace Logic.Skill
if (dmgInfo.IsKill)
{
tmpGrid.Renderer(map)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Fog));
tmpGrid.Renderer(map)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Die));
if (canBeKilled)
tmpGrid.Renderer(map)?.PlayVFXInSight(new GridVFXParams(GridVFXType.Die));
}
unit.Renderer(map)?.InstantUpdateUnit(showoff: true);

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

@ -498,6 +498,9 @@ namespace Logic.Skill
#region [------------------------------------------------------------------------------获取状态值------------------------------------------------------------------------------]
//当前技能是否被ban
public bool IsFrozen(UnitData self);
// 值变化
// 获取额外视野（视野增加）
public int GetExtraSight(UnitData self, MapData mapData);
@ -1048,6 +1051,12 @@ namespace Logic.Skill
#region [------------------------------------------------------------------------------获取状态值------------------------------------------------------------------------------]
//判断当前技能是否被ban，注意这个是unitData的状态，一定要通过unit才知道自己是不是被ban
public bool IsFrozen(UnitData self)
{
return self.IsSkillFrozenForSkillBase(this);
}
// 获取Officer的额外血量
public virtual int GetOfficerHealth() { return 0; }

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

@ -23,6 +23,7 @@ public class UnitMono : MonoBehaviour
public GameObject SuperDefense;
public TextMeshProUGUI UnitInfoName;
public RectTransform InfoGroup;
public Image HideAround;
[Header("Status Area")]
[Tooltip("负面状态图标的父容器")]

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

@ -220,6 +220,8 @@ namespace TH1_Renderer
SyncStatusWithUnitSkills();
//更新隐身透明度
RenderUpdateHideState();
//更新周围隐身提示
RenderUpdateHideAround();
//DebugRender
RenderUpdateDebug();
}
@ -454,6 +456,29 @@ namespace TH1_Renderer
}
}
public void RenderUpdateHideAround()
{
if (_unitMono.HideAround == null) return;
bool show = false;
//只对当前玩家自己的单位显示
var curGrid = _unitData.Grid(Main.MapData);
if (_playerData != null && _playerData.IsSelfPlayer() && curGrid != null)
{
var arounds = Main.MapData.GridMap.GetAroundGridData(1, 1, curGrid);
foreach (var around in arounds)
{
if (around == curGrid) continue;
if (!around.RealUnit(Main.MapData, out var nearUnit)) continue;
if (!nearUnit.IsHideState(Main.MapData)) continue;
//排除自己的单位和同盟单位
if (Main.MapData.SameUnionByUnitId(_unitData.Id, nearUnit.Id)) continue;
show = true;
break;
}
}
_unitMono.HideAround.gameObject.SetActive(show);
}
public void RenderUpdataHighlight()
{
_unitMono.AttackHighlight.SetActive(IsAttackHighlight);

7
Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoCommonBaseSkillCircleMono.cs
View File

@ -27,15 +27,16 @@ namespace TH1_UI.View.Info
{
public HintTrigger HintTrigger;
public Image SkillIcon;
public Image SkillIconBG;
public Image BanImage;
public GameObject SkillLevelArea;
public GameObject SkillTimeArea;
public TextMeshProUGUI SkillLevelText;
public TextMeshProUGUI SkillTimeText;
public void SetContent(SkillBase skill,UnitFullType unitFullType)
public void SetContent(SkillBase skill,UnitFullType unitFullType, bool isBanned = false)
{
var skillType = skill.GetSkillType();
//Step #0 基础变量设置
@ -59,6 +60,8 @@ namespace TH1_UI.View.Info
HintTrigger.DataProvider.UnitFullType = unitFullType;
HintTrigger.DataProvider.SkillParam = skill;
if (BanImage != null)
BanImage.gameObject.SetActive(isBanned);
}

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

@ -538,11 +538,14 @@ namespace TH1_UI.View.Info
//Step #3 设置每一个action
//bool unitIsBanned = unit.IsFrozen();
for (int i = 0; i < SkillCircleMonoList.Count; i++)
if (i < skillSort.Count && skillSort[i] < skillList.Count)
{
var skill = skillList[skillSort[i]];
bool isBanned = skill.IsFrozen(unit);
SkillCircleMonoList[i].gameObject.SetActive(true);
SkillCircleMonoList[i].SetContent(skillList[skillSort[i]],unit.UnitFullType);
SkillCircleMonoList[i].SetContent(skill,unit.UnitFullType,isBanned);
}
else
SkillCircleMonoList[i].gameObject.SetActive(false);