恋恋技能

2026-04-01 19:52:02 +08:00 · 2026-04-01 19:52:02 +08:00 · 64b038c4d8
commit 64b038c4d8
parent 10a1143684
20 changed files with 1806 additions and 516 deletions
--- a/Tools/Multilingual.xlsx
+++ b/Tools/Multilingual.xlsx
--- a/Tools/MultilingualTxt.txt
+++ b/Tools/MultilingualTxt.txt
--- a/Unity/Assets/Resources/DataAssets/SkillDataAssets.asset
+++ b/Unity/Assets/Resources/DataAssets/SkillDataAssets.asset
@ -1977,8 +1977,8 @@ MonoBehaviour:
    skillPriority: 0
  - SkillType: 210
    SkillViewType: 3
-    SkillName: "\u53E4\u660E\u5730\u6050\u60E7"
-    SkillDesc: "\u51CF\u5C1130%\u9632\u5FA1\u529B\uFF0C\u53E0\u52A0\u4E24\u5C42\u7206\u70B8\uFF0C\u5BF9\u5468\u56F4\u9020\u6210\u4F24\u5BB3\u5E76\u4F20\u67D3"
+    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>**"
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: fe4d9ce677c34634f8f135bea67d2a3e, type: 3}
    HasShowList: 0
@ -1986,8 +1986,8 @@ MonoBehaviour:
    skillPriority: 0
  - SkillType: 211
    SkillViewType: 2
-    SkillName: "\u8BFB\u5FC3\u4E4B\u773C"
-    SkillDesc: "\u53EF\u4EE5\u770B\u5230\u9644\u8FD1\u654C\u65B9\u5355\u4F4D\u7684\u6280\u80FD\u4FE1\u606F"
+    SkillName: "\u8111\u6307\u7EB9"
+    SkillDesc: "\u9644\u8FD12\u683C\u5185\u7684\u654C\u65B9\u5355\u4F4D\u53D1\u8D77\u4E3B\u52A8\u653B\u51FB\u524D\u88AB\u9644\u52A01\u5C42**<\u6050\u60E7>**"
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: 0fc32a2f0f0257544a262d24f2007f45, type: 3}
    HasShowList: 0
@ -1995,8 +1995,8 @@ MonoBehaviour:
    skillPriority: 0
  - SkillType: 212
    SkillViewType: 2
-    SkillName: "\u8BFB\u5FC3\u5C01\u5370"
-    SkillDesc: "\u5C01\u5370\u654C\u65B9\u6280\u80FD"
+    SkillName: "DNA\u7684\u7455\u75B5"
+    SkillDesc: "\u4E3B\u52A8\u653B\u51FB\u65F6\u4E3A\u76EE\u6807\u9644\u52A0**<\u5FC3\u7406\u521B\u4F24>**"
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: cb1349a579ede11408e930e7513c4265, type: 3}
    HasShowList: 0
@ -2004,8 +2004,8 @@ MonoBehaviour:
    skillPriority: 0
  - SkillType: 213
    SkillViewType: 3
-    SkillName: "\u6280\u80FD\u5C01\u5370"
-    SkillDesc: "\u6280\u80FD\u88AB\u5C01\u5370\uFF0C\u65E0\u6CD5\u4F7F\u7528"
+    SkillName: "\u5FC3\u7406\u521B\u4F24"
+    SkillDesc: "\u6240\u6709\u80FD\u529B\u5931\u6548"
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: 717815cb183d0d740ac061169e3cf67f, type: 3}
    HasShowList: 0
@ -2014,7 +2014,7 @@ MonoBehaviour:
  - SkillType: 214
    SkillViewType: 3
    SkillName: "\u4E8C\u91CD\u9ED1\u6B7B\u8776"
-    SkillDesc: "\u6B7B\u4EA1\u65F6\uFF0C\u4F7F\u5468\u56F4\u6240\u6709\u62E5\u6709\u6050\u60E7\u7684\u5355\u4F4D\u83B7\u5F97\u7981\u8A00"
+    SkillDesc: "\u6B7B\u4EA1\u65F6\uFF0C\u4F7F\u5468\u56F4\u6240\u6709\u654C\u65B9\u5355\u4F4D\u83B7\u5F97**<\u4E8C\u91CD\u9ED1\u6B7B\u8776>**\uFF0C\u6301\u7EED1\u56DE\u5408\u3002"
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: a718d5b9d0863e9438f829f596b366bc, type: 3}
    HasShowList: 0
@ -2194,7 +2194,7 @@ MonoBehaviour:
  - SkillType: 224
    SkillViewType: 2
    SkillName: "\u6050\u6016\u56DE\u5FC6"
-    SkillDesc: "\u4E3B\u52A8\u653B\u51FB\u6216"
+    SkillDesc: "\u4E3B\u52A8\u653B\u51FB\u65F6\u4E3A\u76EE\u6807\u9644\u52A0**<\u6050\u60E7>**"
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: a08a040eae9080b489eb62a1e78c94fd, type: 3}
    HasShowList: 0
@ -2203,7 +2203,7 @@ MonoBehaviour:
  - SkillType: 242
    SkillViewType: 2
    SkillName: "\u4E8C\u91CD\u9ED1\u6B7B\u8776"
-    SkillDesc: "\u4E3B\u52A8\u653B\u51FB\u6216\u53CD\u51FB\u65F6\uFF0C\u5C06\u4E3A\u5BF9\u65B9\u9644\u52A0xxx"
+    SkillDesc: "\u4E3B\u52A8\u653B\u51FB\u65F6\u4E3A\u76EE\u6807\u9644\u52A0**<\u4E8C\u91CD\u9ED1\u6B7B\u8776>**"
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: a718d5b9d0863e9438f829f596b366bc, type: 3}
    HasShowList: 0
--- a/Unity/Assets/Resources/DataAssets/UnitTypeDataAssets.asset
+++ b/Unity/Assets/Resources/DataAssets/UnitTypeDataAssets.asset
@ -4167,7 +4167,7 @@ MonoBehaviour:
    MoveRange: 1
    AttackRange: 2
    Cost: 0
-    Skills: 20000000e0000000
+    Skills: 20000000e000000002000000
    Sprite: {fileID: 21300000, guid: 08db2adc08231e842ba71741b9f3fb3b, type: 3}
    IsSpriteVarient: 0
    SpriteList: []
@ -4190,7 +4190,7 @@ MonoBehaviour:
    MoveRange: 1
    AttackRange: 2
    Cost: 0
-    Skills: 20000000e0000000d3000000
+    Skills: 20000000e0000000d300000002000000
    Sprite: {fileID: 21300000, guid: 08db2adc08231e842ba71741b9f3fb3b, type: 3}
    IsSpriteVarient: 0
    SpriteList: []
@ -4213,7 +4213,7 @@ MonoBehaviour:
    MoveRange: 1
    AttackRange: 2
    Cost: 0
-    Skills: 20000000e0000000d3000000d4000000
+    Skills: 20000000e0000000d3000000d400000002000000
    Sprite: {fileID: 21300000, guid: 08db2adc08231e842ba71741b9f3fb3b, type: 3}
    IsSpriteVarient: 0
    SpriteList: []
@ -4236,7 +4236,7 @@ MonoBehaviour:
    MoveRange: 1
    AttackRange: 2
    Cost: 0
-    Skills: 20000000e0000000d3000000d4000000d6000000
+    Skills: 20000000e0000000d3000000d4000000f200000002000000
    Sprite: {fileID: 21300000, guid: 08db2adc08231e842ba71741b9f3fb3b, type: 3}
    IsSpriteVarient: 0
    SpriteList: []
--- a/Unity/Assets/Resources/Export/Multilingual.asset
+++ b/Unity/Assets/Resources/Export/Multilingual.asset
@ -353825,7 +353825,7 @@ MonoBehaviour:
    DialogueSpeaker: 
    IsDeprecated: 0
    IsCustom: 0
-    IsSpecialTerm: 0
+    IsSpecialTerm: 1
    Color: 
    Icon: 
  - ID: 17830
@ -356708,4 +356708,346 @@ MonoBehaviour:
    IsSpecialTerm: 0
    Color: 
    Icon: 
+  - ID: 18093
+    ZH: "\u65AF\u5361\u96F7\u7279\xB7\u857E\u7C73\u8389\u4E9A Lv.1"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18094
+    ZH: "\u5E1D\u56FD\u7684\u8840\u4E4B\u541B\u4E3B"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18095
+    ZH: "\u7279\u8272\u80FD\u529B"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18096
+    ZH: "\u7279\u8272\u884C\u52A8"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18097
+    ZH: "\u884C\u52A8\u70B9\u6570"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18098
+    ZH: <color=purple>2</color>
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18099
+    ZH: "\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**<17945>**"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18100
+    ZH: "\u8111\u6307\u7EB9"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18101
+    ZH: "\u9644\u8FD12\u683C\u5185\u7684\u654C\u65B9\u5355\u4F4D\u53D1\u8D77\u4E3B\u52A8\u653B\u51FB\u524D\u88AB\u9644\u52A01\u5C42**<17945>**"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18102
+    ZH: "\u5FC3\u7406\u521B\u4F24"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 1
+    Color: 
+    Icon: 
+  - ID: 18103
+    ZH: "\u6240\u6709\u80FD\u529B\u5931\u6548"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18104
+    ZH: "DNA\u7684\u7455\u75B5"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18105
+    ZH: "\u4E3B\u52A8\u653B\u51FB\u76EE\u6807\u65F6\u9644\u52A0**<18102>**"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18106
+    ZH: "\u6B7B\u4EA1\u65F6\uFF0C\u4F7F\u5468\u56F4\u6240\u6709\u62E5\u6709**<17945>**\u7684\u5355\u4F4D\u83B7\u5F97**<17829>**"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18107
+    ZH: "\u4E3B\u52A8\u653B\u51FB\u65F6\u4E3A\u76EE\u6807\u9644\u52A0**<17945>**"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18108
+    ZH: "\u4E3B\u52A8\u653B\u51FB\u65F6\u4E3A\u76EE\u6807\u9644\u52A0**<17829>**"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18109
+    ZH: "\u4E3B\u52A8\u653B\u51FB\u662F\u4E3A\u76EE\u6807\u9644\u52A0**<18102>**"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18110
+    ZH: "\u4E3B\u52A8\u653B\u51FB\u65F6\u4E3A\u76EE\u6807\u9644\u52A0**<18102>**"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18111
+    ZH: "\u6B7B\u4EA1\u65F6\uFF0C\u4F7F\u5468\u56F4\u6240\u6709\u654C\u65B9\u5355\u4F4D\u83B7\u5F97**<17829>**\uFF0C\u6301\u7EED1\u56DE\u5408\u3002"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
  TargetTypes: 010000000200000003000000040000000500000006000000070000000800000009000000
--- a/Unity/Assets/Resources/Export/SkillDataAssets.asset
+++ b/Unity/Assets/Resources/Export/SkillDataAssets.asset
@ -1971,8 +1971,8 @@ MonoBehaviour:
    skillPriority: 0
  - SkillType: 210
    SkillViewType: 3
-    SkillName: 17755
-    SkillDesc: 17756
+    SkillName: 17945
+    SkillDesc: 18099
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: fe4d9ce677c34634f8f135bea67d2a3e, type: 3}
    HasShowList: 0
@ -1980,8 +1980,8 @@ MonoBehaviour:
    skillPriority: 0
  - SkillType: 211
    SkillViewType: 2
-    SkillName: 17757
-    SkillDesc: 17758
+    SkillName: 18100
+    SkillDesc: 18101
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: 0fc32a2f0f0257544a262d24f2007f45, type: 3}
    HasShowList: 0
@ -1989,8 +1989,8 @@ MonoBehaviour:
    skillPriority: 0
  - SkillType: 212
    SkillViewType: 2
-    SkillName: 17759
-    SkillDesc: 17760
+    SkillName: 18104
+    SkillDesc: 18110
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: cb1349a579ede11408e930e7513c4265, type: 3}
    HasShowList: 0
@ -1998,8 +1998,8 @@ MonoBehaviour:
    skillPriority: 0
  - SkillType: 213
    SkillViewType: 3
-    SkillName: 17761
-    SkillDesc: 17762
+    SkillName: 18102
+    SkillDesc: 18103
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: 717815cb183d0d740ac061169e3cf67f, type: 3}
    HasShowList: 0
@ -2008,7 +2008,7 @@ MonoBehaviour:
  - SkillType: 214
    SkillViewType: 3
    SkillName: 17829
-    SkillDesc: 17833
+    SkillDesc: 18111
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: a718d5b9d0863e9438f829f596b366bc, type: 3}
    HasShowList: 0
@ -2188,7 +2188,7 @@ MonoBehaviour:
  - SkillType: 224
    SkillViewType: 2
    SkillName: 17816
-    SkillDesc: 17817
+    SkillDesc: 18107
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: a08a040eae9080b489eb62a1e78c94fd, type: 3}
    HasShowList: 0
@ -2197,7 +2197,7 @@ MonoBehaviour:
  - SkillType: 242
    SkillViewType: 2
    SkillName: 17829
-    SkillDesc: 17830
+    SkillDesc: 18108
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: a718d5b9d0863e9438f829f596b366bc, type: 3}
    HasShowList: 0
--- a/Unity/Assets/Resources/Export/UnitTypeDataAssets.asset
+++ b/Unity/Assets/Resources/Export/UnitTypeDataAssets.asset
@ -1755,7 +1755,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 2
    UnitLevel: 1
@ -1778,7 +1778,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 2
    UnitLevel: 2
@ -1801,7 +1801,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 2
    UnitLevel: 3
@ -1824,7 +1824,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 5
    UnitLevel: 0
@ -1847,7 +1847,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 9
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 5
    UnitLevel: 1
@ -1870,7 +1870,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 9
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 5
    UnitLevel: 2
@ -1893,7 +1893,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 9
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 5
    UnitLevel: 3
@ -1916,7 +1916,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 9
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 3
    UnitLevel: 0
@ -1939,7 +1939,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 3
    UnitLevel: 1
@ -1962,7 +1962,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 3
    UnitLevel: 2
@ -1985,7 +1985,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 3
    UnitLevel: 3
@ -2008,7 +2008,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 1
    UnitLevel: 0
@ -2031,7 +2031,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 1
    UnitLevel: 1
@ -2054,7 +2054,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 2
  - UnitType: 14
    GiantType: 1
    UnitLevel: 2
@ -2077,7 +2077,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 3
  - UnitType: 14
    GiantType: 1
    UnitLevel: 3
@ -2100,7 +2100,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 4
  - UnitType: 14
    GiantType: 4
    UnitLevel: 0
@ -2123,7 +2123,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 4
    UnitLevel: 1
@ -2146,7 +2146,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 4
    UnitLevel: 2
@ -2169,7 +2169,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 4
    UnitLevel: 3
@ -2192,7 +2192,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 19
    GiantType: 0
    UnitLevel: 0
@ -3000,7 +3000,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 12
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 6
    UnitLevel: 1
@ -3023,7 +3023,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 12
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 6
    UnitLevel: 2
@ -3046,7 +3046,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 12
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 6
    UnitLevel: 3
@ -3069,7 +3069,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 12
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 9
    UnitLevel: 0
@ -3092,7 +3092,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 2
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 9
    UnitLevel: 1
@ -3115,7 +3115,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 2
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 9
    UnitLevel: 2
@ -3138,7 +3138,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 2
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 9
    UnitLevel: 3
@ -3161,7 +3161,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 2
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 8
    UnitLevel: 0
@ -3184,7 +3184,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 8
    UnitLevel: 1
@ -3207,7 +3207,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 2
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 8
    UnitLevel: 2
@ -3230,7 +3230,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 2
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 8
    UnitLevel: 3
@ -3253,7 +3253,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 2
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 7
    UnitLevel: 0
@ -3276,7 +3276,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 11
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 7
    UnitLevel: 1
@ -3299,7 +3299,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 11
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 7
    UnitLevel: 2
@ -3322,7 +3322,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 11
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 7
    UnitLevel: 3
@ -3345,7 +3345,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 11
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 10
    UnitLevel: 0
@ -3368,7 +3368,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 10
    ForceMelee: 1
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 10
    UnitLevel: 1
@ -3391,7 +3391,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 10
    ForceMelee: 1
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 10
    UnitLevel: 2
@ -3414,7 +3414,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 10
    ForceMelee: 1
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 10
    UnitLevel: 3
@ -3437,7 +3437,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 10
    ForceMelee: 1
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 23
    GiantType: 0
    UnitLevel: 1
@ -3713,7 +3713,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 11
    UnitLevel: 1
@ -3736,7 +3736,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 11
    UnitLevel: 2
@ -3759,7 +3759,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 11
    UnitLevel: 3
@ -3782,7 +3782,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 12
    UnitLevel: 0
@ -3805,7 +3805,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 2
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 12
    UnitLevel: 1
@ -3828,7 +3828,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 14
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 12
    UnitLevel: 2
@ -3851,7 +3851,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 14
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 12
    UnitLevel: 3
@ -3874,7 +3874,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 14
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 13
    UnitLevel: 0
@ -3897,7 +3897,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 15
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 13
    UnitLevel: 1
@ -3920,7 +3920,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 15
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 13
    UnitLevel: 2
@ -3943,7 +3943,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 15
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 13
    UnitLevel: 3
@ -3966,7 +3966,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 15
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 14
    UnitLevel: 0
@ -3989,7 +3989,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 14
    UnitLevel: 1
@ -4012,7 +4012,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 14
    UnitLevel: 2
@ -4035,7 +4035,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 14
    UnitLevel: 3
@ -4058,7 +4058,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 15
    UnitLevel: 0
@ -4081,7 +4081,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 15
    UnitLevel: 1
@ -4104,7 +4104,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 15
    UnitLevel: 2
@ -4127,7 +4127,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 15
    UnitLevel: 3
@ -4150,7 +4150,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 16
    UnitLevel: 0
@ -4167,13 +4167,13 @@ MonoBehaviour:
    MoveRange: 1
    AttackRange: 2
    Cost: 0
-    Skills: 20000000e0000000
+    Skills: 20000000e000000002000000
    Sprite: {fileID: 21300000, guid: 08db2adc08231e842ba71741b9f3fb3b, type: 3}
    IsSpriteVarient: 0
    SpriteList: []
    ProjectileType: 17
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 16
    UnitLevel: 1
@ -4190,13 +4190,13 @@ MonoBehaviour:
    MoveRange: 1
    AttackRange: 2
    Cost: 0
-    Skills: 20000000e0000000d3000000
+    Skills: 20000000e0000000d300000002000000
    Sprite: {fileID: 21300000, guid: 08db2adc08231e842ba71741b9f3fb3b, type: 3}
    IsSpriteVarient: 0
    SpriteList: []
    ProjectileType: 17
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 16
    UnitLevel: 2
@ -4213,13 +4213,13 @@ MonoBehaviour:
    MoveRange: 1
    AttackRange: 2
    Cost: 0
-    Skills: 20000000e0000000d3000000d4000000
+    Skills: 20000000e0000000d3000000d400000002000000
    Sprite: {fileID: 21300000, guid: 08db2adc08231e842ba71741b9f3fb3b, type: 3}
    IsSpriteVarient: 0
    SpriteList: []
    ProjectileType: 17
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 16
    UnitLevel: 3
@ -4236,13 +4236,13 @@ MonoBehaviour:
    MoveRange: 1
    AttackRange: 2
    Cost: 0
-    Skills: 20000000e0000000d3000000d4000000d6000000
+    Skills: 20000000e0000000d3000000d4000000f200000002000000
    Sprite: {fileID: 21300000, guid: 08db2adc08231e842ba71741b9f3fb3b, type: 3}
    IsSpriteVarient: 0
    SpriteList: []
    ProjectileType: 17
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 17
    UnitLevel: 0
@ -4357,7 +4357,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 18
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 20
    UnitLevel: 1
@ -4380,7 +4380,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 18
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 20
    UnitLevel: 2
@ -4403,7 +4403,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 18
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 20
    UnitLevel: 3
@ -4426,7 +4426,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 18
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 18
    UnitLevel: 0
@ -4449,7 +4449,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 18
    UnitLevel: 1
@ -4472,7 +4472,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 18
    UnitLevel: 2
@ -4495,7 +4495,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 18
    UnitLevel: 3
@ -4518,7 +4518,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 19
    UnitLevel: 0
@ -4541,7 +4541,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 19
    UnitLevel: 1
@ -4564,7 +4564,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 19
    UnitLevel: 2
@ -4587,7 +4587,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 14
    GiantType: 19
    UnitLevel: 3
@ -4610,7 +4610,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 30
    GiantType: 0
    UnitLevel: 1
@ -4633,7 +4633,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 30
    GiantType: 0
    UnitLevel: 2
@ -4656,7 +4656,7 @@ MonoBehaviour:
    SpriteList: []
    ProjectileType: 1
    ForceMelee: 0
-    SameUnitCountLimit: 0
+    SameUnitCountLimit: 1
  - UnitType: 30
    GiantType: 0
    UnitLevel: 3
--- a/Unity/Assets/Resources/Export/WikiDataAssets.asset
+++ b/Unity/Assets/Resources/Export/WikiDataAssets.asset
@ -12,4 +12,58 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: fef88da398754b9f95a963df255aef73, type: 3}
  m_Name: WikiDataAssets
  m_EditorClassIdentifier: 
-  Items: []
+  Items:
+  - Id: 1
+    Name: "\u9053\u8DEF"
+    Types: 0000000001000000
+    DescItems:
+    - DescType: 0
+      Desc: "\u9053\u8DEF\u5C31\u662F\u9053\u8DEF"
+      UseHint: 0
+      HintProvider:
+        HintDataType: 0
+        Text: "\u9ED8\u8BA4\u9759\u6001\u6587\u672C..."
+        TechTypeData: 0
+        SkillTypeData: 0
+        ActionIdData:
+          ActionType: 0
+          WonderType: 0
+          ResourceType: 0
+          FeatureType: 0
+          TerrainType: 0
+          UnitType: 0
+          GiantType: 0
+          UnitLevel: 0
+          Vegetation: 0
+          UnitActionType: 0
+          CityLevelUpActionType: 0
+          GridMiscActionType: 0
+          SkillType: 0
+          TechType: 0
+          PlayerActionType: 0
+          AIParamType: 0
+        locked: 0
+        TextData:
+          ActionType: 0
+          WonderType: 0
+          ResourceType: 0
+          FeatureType: 0
+          TerrainType: 0
+          UnitType: 0
+          GiantType: 0
+          UnitLevel: 0
+          Vegetation: 0
+          UnitActionType: 0
+          CityLevelUpActionType: 0
+          GridMiscActionType: 0
+          SkillType: 0
+          TechType: 0
+          PlayerActionType: 0
+          AIParamType: 0
+        TechAtom: 0
+        GeoIdList: 
+        UnitFullType:
+          UnitType: 0
+          GiantType: 0
+          UnitLevel: 0
+        PlayerTaskType: 0
--- a/Unity/Assets/Resources/Prefab/UI/Hint/HeroHintPanel.prefab
+++ b/Unity/Assets/Resources/Prefab/UI/Hint/HeroHintPanel.prefab
@ -520,7 +520,7 @@ MonoBehaviour:
  Ban: 0
  NoExport: 0
  FontBan: 0
-  ID: 2487
+  ID: 18094
  FontID: 2
  TextCfg:
  - Type: 1
@ -928,7 +928,7 @@ MonoBehaviour:
  Ban: 0
  NoExport: 0
  FontBan: 0
-  ID: 2487
+  ID: 18093
  FontID: 2
  TextCfg:
  - Type: 1
@ -1697,6 +1697,7 @@ GameObject:
  - component: {fileID: 2082672394516330348}
  - component: {fileID: 2773266311182802688}
  - component: {fileID: 7261244619654367073}
+  - component: {fileID: 2221824053007530838}
  m_Layer: 5
  m_Name: ValueText
  m_TagString: Untagged
@ -1820,6 +1821,24 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &2221824053007530838
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2446778966974180511}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Ban: 0
+  NoExport: 0
+  FontBan: 0
+  ID: 16657
+  FontID: 0
+  TextCfg: []
 --- !u!1 &2467682526022886692
 GameObject:
  m_ObjectHideFlags: 0
@ -2183,6 +2202,7 @@ GameObject:
  - component: {fileID: 6953585192054433822}
  - component: {fileID: 5997026997592964859}
  - component: {fileID: 4311038199748607962}
+  - component: {fileID: 5373558977600345637}
  m_Layer: 5
  m_Name: ValueText
  m_TagString: Untagged
@ -2306,6 +2326,24 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &5373558977600345637
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2756293004775770370}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Ban: 0
+  NoExport: 0
+  FontBan: 0
+  ID: 16657
+  FontID: 0
+  TextCfg: []
 --- !u!1 &2907480520167680622
 GameObject:
  m_ObjectHideFlags: 0
@ -3595,7 +3633,7 @@ MonoBehaviour:
  Ban: 0
  NoExport: 0
  FontBan: 0
-  ID: 2495
+  ID: 18095
  FontID: 2
  TextCfg:
  - Type: 1
@ -4097,6 +4135,7 @@ GameObject:
  - component: {fileID: 5755012627275042148}
  - component: {fileID: 6648041823464642789}
  - component: {fileID: 7726574917283235869}
+  - component: {fileID: -8081978554177258609}
  m_Layer: 5
  m_Name: ValueText
  m_TagString: Untagged
@ -4220,6 +4259,24 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &-8081978554177258609
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5239182831350449201}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Ban: 0
+  NoExport: 0
+  FontBan: 0
+  ID: 16657
+  FontID: 0
+  TextCfg: []
 --- !u!1 &5458195469017056080
 GameObject:
  m_ObjectHideFlags: 0
@ -4391,7 +4448,7 @@ MonoBehaviour:
  Ban: 0
  NoExport: 0
  FontBan: 0
-  ID: 2495
+  ID: 18096
  FontID: 2
  TextCfg:
  - Type: 1
@ -4486,6 +4543,7 @@ GameObject:
  - component: {fileID: 1538204132250716564}
  - component: {fileID: 5849016996692753176}
  - component: {fileID: 5077837050467689366}
+  - component: {fileID: -314698104716294779}
  m_Layer: 5
  m_Name: ValueText
  m_TagString: Untagged
@ -4609,6 +4667,24 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &-314698104716294779
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5941847526330667069}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Ban: 0
+  NoExport: 0
+  FontBan: 0
+  ID: 16657
+  FontID: 0
+  TextCfg: []
 --- !u!1 &6001073469445296752
 GameObject:
  m_ObjectHideFlags: 0
@ -5604,6 +5680,7 @@ GameObject:
  - component: {fileID: 5689689777231770551}
  - component: {fileID: 944666515619266281}
  - component: {fileID: 4472386642577528842}
+  - component: {fileID: -9080591186769377653}
  m_Layer: 5
  m_Name: ValueText
  m_TagString: Untagged
@ -5727,6 +5804,24 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &-9080591186769377653
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8592735400957489178}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Ban: 0
+  NoExport: 0
+  FontBan: 0
+  ID: 16941
+  FontID: 0
+  TextCfg: []
 --- !u!1 &8710762835605978114
 GameObject:
  m_ObjectHideFlags: 0
--- a/Unity/Assets/Resources/Prefab/UI/Info/UIInfoGridInfo.prefab
+++ b/Unity/Assets/Resources/Prefab/UI/Info/UIInfoGridInfo.prefab
@ -3841,6 +3841,7 @@ GameObject:
  - component: {fileID: 124901836524755543}
  - component: {fileID: 6316731918864167048}
  - component: {fileID: 7651967717230701469}
+  - component: {fileID: 7118543990191626721}
  m_Layer: 5
  m_Name: Text
  m_TagString: Untagged
@ -3978,6 +3979,24 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_HorizontalFit: 2
  m_VerticalFit: 0
+--- !u!114 &7118543990191626721
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4887733022453635796}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Ban: 0
+  NoExport: 0
+  FontBan: 0
+  ID: 18097
+  FontID: 0
+  TextCfg: []
 --- !u!1 &4930310677127297208
 GameObject:
  m_ObjectHideFlags: 0
--- a/Unity/Assets/Resources/Prefab/UI/Top/UITopTopBar.prefab
+++ b/Unity/Assets/Resources/Prefab/UI/Top/UITopTopBar.prefab
@ -2932,7 +2932,7 @@ MonoBehaviour:
  Ban: 1
  NoExport: 0
  FontBan: 1
-  ID: 17064
+  ID: 18098
  FontID: 0
  TextCfg:
  - Type: 0
--- a/Unity/Assets/Scenes/SampleScene.unity
+++ b/Unity/Assets/Scenes/SampleScene.unity
--- a/Unity/Assets/Scripts/TH1_Logic/Action/TrainUnitActionLogic.cs
+++ b/Unity/Assets/Scripts/TH1_Logic/Action/TrainUnitActionLogic.cs
@ -369,44 +369,32 @@ namespace Logic.Action
            return false;
        }

-        //判断场上的giant是否已经有一个了(会处理芙兰这种quartet的情况)
-        
-        private bool CheckHeroHasOne(CommonActionParams actionParam)
+        /// <summary>
+        /// 判断场上的英雄数量是否已经达到 SameUnitCountLimit 上限
+        /// </summary>
+        private bool CheckHeroReachMaxCount(CommonActionParams actionParam)
        {
-            uint heroLevel = _actionId.UnitLevel;
-            heroLevel = actionParam.PlayerData.PlayerHeroData.GetHeroLevel(_actionId.GiantType);
-            //获取unitTypeInfo,level=0时的信息
-            if(!Table.Instance.UnitTypeDataAssets.GetUnitTypeInfo(_actionId.UnitType, _actionId.GiantType,heroLevel,
-                   out var heroInfo))
+            // 获取英雄当前等级
+            uint heroLevel = actionParam.PlayerData.PlayerHeroData.GetHeroLevel(_actionId.GiantType);
+
+            // 获取 unitTypeInfo
+            if (!Table.Instance.UnitTypeDataAssets.GetUnitTypeInfo(_actionId.UnitType, _actionId.GiantType, heroLevel,
+                    out var heroInfo))
                return true;
-            //如果有Unique且全场已经有1个了
-            if (heroInfo.Skills.Contains(SkillType.UNIQUE))
+
+            // 获取当前场上该英雄的数量
+            int currentCount = Main.PlayerLogic.GetMapUnitTypeCount(actionParam.MapData, _actionId.UnitType, _actionId.GiantType);
+
+            // 特判：FrenchMokou 和 KaguyaFrenchMokouEgg 共享计数
+            if (_actionId.GiantType == GiantType.FrenchMokou)
            {
-                if (Main.PlayerLogic.GetMapUnitTypeCount(actionParam.MapData, _actionId.UnitType, _actionId.GiantType) > 0) return true;
-                //额外处理妹红的蛋
-                if(_actionId.GiantType == GiantType.FrenchMokou &&
-                   (Main.PlayerLogic.GetMapUnitTypeCount(actionParam.MapData, UnitType.KaguyaFrenchMokouEgg, GiantType.None) > 0))
-                    return true;
-            }
-            //如果有DUO且全场已经有2个了
-            if (heroInfo.Skills.Contains(SkillType.DUO))
-            {
-                if(Main.PlayerLogic.GetMapUnitTypeCount(actionParam.MapData,_actionId.UnitType, _actionId.GiantType) > 1)
-                    return true;
-            }
-            //如果有TRIO且全场已经有3个了
-            if (heroInfo.Skills.Contains(SkillType.TRIO))
-            {
-                if(Main.PlayerLogic.GetMapUnitTypeCount(actionParam.MapData,_actionId.UnitType, _actionId.GiantType) > 2)
-                    return true;
-            }
-            //如果有QUARTER且全场已经有4个了
-            if (heroInfo.Skills.Contains(SkillType.QUARTET))
-            {
-                if(Main.PlayerLogic.GetMapUnitTypeCount(actionParam.MapData,_actionId.UnitType, _actionId.GiantType) > 3)
-                    return true;
+                currentCount += Main.PlayerLogic.GetMapUnitTypeCount(actionParam.MapData, UnitType.KaguyaFrenchMokouEgg, GiantType.None);
            }

+            // 判断是否达到上限 (SameUnitCountLimit 为 0 表示无限制)
+            if (heroInfo.SameUnitCountLimit > 0 && currentCount >= heroInfo.SameUnitCountLimit)
+                return true;
+
            return false;
        }
        protected override bool Execute(CommonActionParams actionParams)
@ -495,7 +483,7 @@ namespace Logic.Action
                //step #7 如果英雄在冷却cd
                if (CheckGiantHasColdTime(actionParam)) return false;
                //step #8 如果英雄违反了UNIQUE或类似的技能如QUARTET
-                if (CheckHeroHasOne(actionParam)) return false;
+                if (CheckHeroReachMaxCount(actionParam)) return false;
                
                return true;
            }
@ -519,7 +507,7 @@ namespace Logic.Action
                //step #7 如果英雄在冷却cd
                if (CheckGiantHasColdTime(actionParam)) return false;
                //step #8 如果英雄违反了UNIQUE或类似的技能如QUARTET
-                if (CheckHeroHasOne(actionParam)) return false;
+                if (CheckHeroReachMaxCount(actionParam)) return false;
                
                if (_actionId.UnitType == UnitType.Giant
                    && (gridData.Resource is ResourceType.Military  or ResourceType.RemiliaMilitary or ResourceType.MoriyaMilitary))
@ -560,7 +548,7 @@ namespace Logic.Action
                //step #7 如果英雄在冷却cd
                if (CheckGiantHasColdTime(actionParam)) showType = ShowType.Cold;
                //step #8 如果英雄违反了UNIQUE或类似的技能如QUARTET
-                if (CheckHeroHasOne(actionParam)) return false;
+                if (CheckHeroReachMaxCount(actionParam)) return false;
                
                return true;
            }
@ -584,7 +572,7 @@ namespace Logic.Action
                //step #7 如果英雄在冷却cd
                if (CheckGiantHasColdTime(actionParam)) showType = ShowType.Cold;  
                //step #8 如果英雄违反了UNIQUE或类似的技能如QUARTET
-                if (CheckHeroHasOne(actionParam)) return false;
+                if (CheckHeroReachMaxCount(actionParam)) return false;
                
                if (_actionId.UnitType == UnitType.Giant
                    && (gridData.Resource is ResourceType.Military  or ResourceType.RemiliaMilitary or ResourceType.MoriyaMilitary))
--- a/Unity/Assets/Scripts/TH1_Logic/Skill/AllSkill/SkillBanBombSkill.cs
+++ b/Unity/Assets/Scripts/TH1_Logic/Skill/AllSkill/SkillBanBombSkill.cs
@ -45,22 +45,15 @@ namespace Logic.Skill
                if (around == grid) continue;
                around.RealUnit(mapData,out var target);
                if (target == null) continue;
-
-                // 只给拥有 KomeijiFear 的单位添加 SkillBan
-                if (target.GetSkill(SkillType.KomeijiFear, out _))
-                {
-                    target.AddOrOverrideSkill(SkillType.SkillBan, mapData, info.DamageTarget.Id);
-                    unitsToRefresh.Add(target.Id);
-                }
+                target.AddOrOverrideSkill(SkillType.SkillBan, mapData, info.DamageTarget.Id);
+                unitsToRefresh.Add(target.Id);
+                
            }

            // 刷新所有受影响单位的UI显示
            RefreshUnitsStatus(unitsToRefresh);
        }
-
-        /// <summary>
-        /// 刷新指定单位列表的状态显示
-        /// </summary>
+        
        private void RefreshUnitsStatus(System.Collections.Generic.List<uint> unitIds)
        {
            if (MapRenderer.Instance == null) return;
--- a/Unity/Assets/Scripts/TH1_Logic/Skill/Generate/MeilingAttackUpSkill.MemoryPackable.g.cs
+++ b/Unity/Assets/Scripts/TH1_Logic/Skill/Generate/MeilingAttackUpSkill.MemoryPackable.g.cs
@ -0,0 +1,13 @@
+// Auto-generated MeilingAttackUpSkill partial class with MemoryPackable attribute
+// 此文件由 MemoryPackUnionGenerator 自动生成，请勿手动修改
+
+using MemoryPack;
+using Logic.Skill;
+
+namespace Logic.Skill
+{
+    [MemoryPackable]
+    public partial class MeilingAttackUpSkill
+    {
+    }
+}
--- a/Unity/Assets/Scripts/TH1_Logic/Skill/Generate/MeilingAttackUpSkill.MemoryPackable.g.cs.meta
+++ b/Unity/Assets/Scripts/TH1_Logic/Skill/Generate/MeilingAttackUpSkill.MemoryPackable.g.cs.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c3ced020b5422b24ba1e7fa02bfedbed
+guid: ddb35f18c7127cf45b5b0695b2c90928
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/Unity/Assets/Scripts/TH1_Logic/Skill/Generate/RinIndianAttackSkill.MemoryPackable.g.cs
+++ b/Unity/Assets/Scripts/TH1_Logic/Skill/Generate/RinIndianAttackSkill.MemoryPackable.g.cs
@ -1 +0,0 @@
-// 删除此文件 - 错误创建的文件
--- a/Unity/Assets/Scripts/TH1_Logic/Skill/Generate/SatoriAttackBoomSkill.MemoryPackable.g.cs
+++ b/Unity/Assets/Scripts/TH1_Logic/Skill/Generate/SatoriAttackBoomSkill.MemoryPackable.g.cs
@ -0,0 +1,13 @@
+// Auto-generated SatoriAttackBoomSkill partial class with MemoryPackable attribute
+// 此文件由 MemoryPackUnionGenerator 自动生成，请勿手动修改
+
+using MemoryPack;
+using Logic.Skill;
+
+namespace Logic.Skill
+{
+    [MemoryPackable]
+    public partial class SatoriAttackBoomSkill
+    {
+    }
+}
--- a/Unity/Assets/Scripts/TH1_Logic/Skill/Generate/SatoriAttackBoomSkill.MemoryPackable.g.cs.meta
+++ b/Unity/Assets/Scripts/TH1_Logic/Skill/Generate/SatoriAttackBoomSkill.MemoryPackable.g.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ebe190281a1c05d4f9f4355bf2b269ee
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Unity/Assets/Scripts/TH1_Logic/Skill/Generate/SkillBase.MemoryPackUnion.g.cs
+++ b/Unity/Assets/Scripts/TH1_Logic/Skill/Generate/SkillBase.MemoryPackUnion.g.cs
@ -235,7 +235,9 @@ namespace Logic.Skill
    [MemoryPackUnion(227, typeof(YuugiMoveSkill))]
    [MemoryPackUnion(228, typeof(YuugiMovePlusSkill))]
    [MemoryPackUnion(229, typeof(SatoriAttackSkill))]
-    [MemoryPackUnion(230, typeof(KomeijiFearImmuneSkill))]
+    [MemoryPackUnion(230, typeof(SatoriAttackBoomSkill))]
+    [MemoryPackUnion(231, typeof(KomeijiFearImmuneSkill))]
+    [MemoryPackUnion(232, typeof(MeilingAttackUpSkill))]
    public abstract partial class SkillBase
    {
    }