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

2026-04-10 18:17:32 +08:00 · 2026-04-10 18:17:32 +08:00 · cd0ab9c4ee
commit cd0ab9c4ee
parent c666a7fe4c fe34ea0da0
16 changed files with 871 additions and 245 deletions
--- a/Tools/Multilingual.xlsx
+++ b/Tools/Multilingual.xlsx
--- a/Tools/MultilingualTxt.txt
+++ b/Tools/MultilingualTxt.txt
--- a/Unity/Assets/Resources/ArtResources/TH1Units/Giant/IndianRin_Juggernaut.png
+++ b/Unity/Assets/Resources/ArtResources/TH1Units/Giant/IndianRin_Juggernaut.png
--- a/Unity/Assets/Resources/ArtResources/TH1Units/Giant/IndianRin_Juggernaut.png.meta
+++ b/Unity/Assets/Resources/ArtResources/TH1Units/Giant/IndianRin_Juggernaut.png.meta
@ -0,0 +1,114 @@
+fileFormatVersion: 2
+guid: 74ad98c2f4cdf3541822658acc86f5c9
+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: 
--- a/Unity/Assets/Resources/ArtResources/TH1Units/Giant/IndianSatori_Juggernaut.png
+++ b/Unity/Assets/Resources/ArtResources/TH1Units/Giant/IndianSatori_Juggernaut.png
--- a/Unity/Assets/Resources/ArtResources/TH1Units/Giant/IndianSatori_Juggernaut.png.meta
+++ b/Unity/Assets/Resources/ArtResources/TH1Units/Giant/IndianSatori_Juggernaut.png.meta
@ -0,0 +1,114 @@
+fileFormatVersion: 2
+guid: c24c5872e76eb024eb5d16ed589da1b4
+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: 
--- a/Unity/Assets/Resources/ArtResources/TH1Units/Giant/IndianYuugi_Juggernaut.png
+++ b/Unity/Assets/Resources/ArtResources/TH1Units/Giant/IndianYuugi_Juggernaut.png
--- a/Unity/Assets/Resources/ArtResources/TH1Units/Giant/IndianYuugi_Juggernaut.png.meta
+++ b/Unity/Assets/Resources/ArtResources/TH1Units/Giant/IndianYuugi_Juggernaut.png.meta
@ -0,0 +1,114 @@
+fileFormatVersion: 2
+guid: 47acdac93fae81548936db0f26c72e50
+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: 
--- a/Unity/Assets/Resources/DataAssets/SkillDataAssets.asset
+++ b/Unity/Assets/Resources/DataAssets/SkillDataAssets.asset
@ -2335,7 +2335,7 @@ MonoBehaviour:
  - SkillType: 249
    SkillViewType: 4
    SkillName: "\u7F57\u5239\u51ED\u4F9D"
-    SkillDesc: "\u88AB**<\u6BD5\u820D\u906E>**\u9644\u7075\u540E\u83B7\u5F971\u5C42\u3002\u6BCF\u5C42\u63D0\u4F9B0.5\u653B\u51FB\u529B\uFF0C\u4E0A\u96502\u5C42\uFF0C\u6B7B\u4EA1\u65F6\u4EA7\u751F\u5269\u4F59\u5C42\u6570\u4E2A**<\u6BD5\u820D\u906E>**"
+    SkillDesc: "\u88AB**<\u6BD5\u820D\u906E>**\u9644\u7075\u540E\uFF0C\u6062\u590D5\u70B9\u751F\u547D\u503C\uFF0C\u83B7\u5F971\u70B9**<\u653B\u51FB\u884C\u52A8\u70B9>**"
    NotShow: 0
    SkillIcon: {fileID: 21300000, guid: 2afc69cdc28e01a4d97d8770ffc05164, type: 3}
    HasShowList: 0
--- a/Unity/Assets/Resources/DataAssets/UnitTypeDataAssets.asset
+++ b/Unity/Assets/Resources/DataAssets/UnitTypeDataAssets.asset
@ -2307,8 +2307,8 @@ MonoBehaviour:
    ChessType: 0
    GiantCivId: 0
    GiantForceId: 0
-    Name: "\u82F1\u96C4\u6218\u8230Lv.1"
-    Desc: "\u82F1\u96C4\u6218\u8230Lv.1\uFF0C\u7B49\u7EA7\u6E90\u4E8E\u8239\u4E0A\u82F1\u96C4\u7B49\u7EA7\u3002"
+    Name: "\u82F1\u96C4\u6218\u8230Lv.0"
+    Desc: "\u82F1\u96C4\u6218\u8230Lv.0\uFF0C\u7B49\u7EA7\u6E90\u4E8E\u8239\u4E0A\u82F1\u96C4\u7B49\u7EA7\u3002"
    LandType: 2
    NoMaxHealth: 1
    MaxHealth: 50
@ -2448,8 +2448,47 @@ MonoBehaviour:
      OnlyCarryGiant: 1
      CarryGiantType: 15
      Sprite: {fileID: 21300000, guid: 8e8a11d0f93b5114b88162319dde238e, type: 3}
-      Name: 
-      Desc: 
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 16
+      Sprite: {fileID: 21300000, guid: c24c5872e76eb024eb5d16ed589da1b4, type: 3}
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 19
+      Sprite: {fileID: 21300000, guid: 47acdac93fae81548936db0f26c72e50, type: 3}
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 20
+      Sprite: {fileID: 21300000, guid: 74ad98c2f4cdf3541822658acc86f5c9, type: 3}
+      Name:
+      Desc:
      HasLevel: 0
      LevelSprite: []
    ProjectileType: 1
@ -2463,8 +2502,8 @@ MonoBehaviour:
    ChessType: 0
    GiantCivId: 0
    GiantForceId: 0
-    Name: "\u82F1\u96C4\u6218\u8230Lv.2"
-    Desc: "\u82F1\u96C4\u6218\u8230Lv.2\uFF0C\u7B49\u7EA7\u6E90\u4E8E\u8239\u4E0A\u82F1\u96C4\u7B49\u7EA7\u3002"
+    Name: "\u82F1\u96C4\u6218\u8230Lv.1"
+    Desc: "\u82F1\u96C4\u6218\u8230Lv.1\uFF0C\u7B49\u7EA7\u6E90\u4E8E\u8239\u4E0A\u82F1\u96C4\u7B49\u7EA7\u3002"
    LandType: 2
    NoMaxHealth: 1
    MaxHealth: 50
@ -2604,8 +2643,47 @@ MonoBehaviour:
      OnlyCarryGiant: 1
      CarryGiantType: 15
      Sprite: {fileID: 21300000, guid: 8e8a11d0f93b5114b88162319dde238e, type: 3}
-      Name: 
-      Desc: 
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 16
+      Sprite: {fileID: 21300000, guid: c24c5872e76eb024eb5d16ed589da1b4, type: 3}
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 19
+      Sprite: {fileID: 21300000, guid: 47acdac93fae81548936db0f26c72e50, type: 3}
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 20
+      Sprite: {fileID: 21300000, guid: 74ad98c2f4cdf3541822658acc86f5c9, type: 3}
+      Name:
+      Desc:
      HasLevel: 0
      LevelSprite: []
    ProjectileType: 1
@ -2619,8 +2697,8 @@ MonoBehaviour:
    ChessType: 0
    GiantCivId: 0
    GiantForceId: 0
-    Name: "\u82F1\u96C4\u6218\u8230Lv.3"
-    Desc: "\u82F1\u96C4\u6218\u8230Lv.3\uFF0C\u7B49\u7EA7\u6E90\u4E8E\u8239\u4E0A\u82F1\u96C4\u7B49\u7EA7\u3002"
+    Name: "\u82F1\u96C4\u6218\u8230Lv.2"
+    Desc: "\u82F1\u96C4\u6218\u8230Lv.2\uFF0C\u7B49\u7EA7\u6E90\u4E8E\u8239\u4E0A\u82F1\u96C4\u7B49\u7EA7\u3002"
    LandType: 2
    NoMaxHealth: 1
    MaxHealth: 50
@ -2760,8 +2838,47 @@ MonoBehaviour:
      OnlyCarryGiant: 1
      CarryGiantType: 15
      Sprite: {fileID: 21300000, guid: 8e8a11d0f93b5114b88162319dde238e, type: 3}
-      Name: 
-      Desc: 
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 16
+      Sprite: {fileID: 21300000, guid: c24c5872e76eb024eb5d16ed589da1b4, type: 3}
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 19
+      Sprite: {fileID: 21300000, guid: 47acdac93fae81548936db0f26c72e50, type: 3}
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 20
+      Sprite: {fileID: 21300000, guid: 74ad98c2f4cdf3541822658acc86f5c9, type: 3}
+      Name:
+      Desc:
      HasLevel: 0
      LevelSprite: []
    ProjectileType: 1
@ -2775,8 +2892,8 @@ MonoBehaviour:
    ChessType: 0
    GiantCivId: 0
    GiantForceId: 0
-    Name: "\u82F1\u96C4\u6218\u8230Lv.4"
-    Desc: "\u82F1\u96C4\u6218\u8230Lv.4\uFF0C\u7B49\u7EA7\u6E90\u4E8E\u8239\u4E0A\u82F1\u96C4\u7B49\u7EA7\u3002"
+    Name: "\u82F1\u96C4\u6218\u8230Lv.3"
+    Desc: "\u82F1\u96C4\u6218\u8230Lv.3\uFF0C\u7B49\u7EA7\u6E90\u4E8E\u8239\u4E0A\u82F1\u96C4\u7B49\u7EA7\u3002"
    LandType: 2
    NoMaxHealth: 1
    MaxHealth: 50
@ -2916,8 +3033,47 @@ MonoBehaviour:
      OnlyCarryGiant: 1
      CarryGiantType: 15
      Sprite: {fileID: 21300000, guid: 8e8a11d0f93b5114b88162319dde238e, type: 3}
-      Name: 
-      Desc: 
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 16
+      Sprite: {fileID: 21300000, guid: c24c5872e76eb024eb5d16ed589da1b4, type: 3}
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 19
+      Sprite: {fileID: 21300000, guid: 47acdac93fae81548936db0f26c72e50, type: 3}
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 20
+      Sprite: {fileID: 21300000, guid: 74ad98c2f4cdf3541822658acc86f5c9, type: 3}
+      Name:
+      Desc:
      HasLevel: 0
      LevelSprite: []
    ProjectileType: 1
@ -2994,8 +3150,47 @@ MonoBehaviour:
      OnlyCarryGiant: 1
      CarryGiantType: 1
      Sprite: {fileID: 21300000, guid: 8882d0798639d724597929feb0c1ee17, type: 3}
-      Name: 
-      Desc: 
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 16
+      Sprite: {fileID: 21300000, guid: c24c5872e76eb024eb5d16ed589da1b4, type: 3}
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 19
+      Sprite: {fileID: 21300000, guid: 47acdac93fae81548936db0f26c72e50, type: 3}
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 20
+      Sprite: {fileID: 21300000, guid: 74ad98c2f4cdf3541822658acc86f5c9, type: 3}
+      Name:
+      Desc:
      HasLevel: 0
      LevelSprite: []
    ProjectileType: 1
@ -3072,8 +3267,47 @@ MonoBehaviour:
      OnlyCarryGiant: 1
      CarryGiantType: 1
      Sprite: {fileID: 21300000, guid: 8882d0798639d724597929feb0c1ee17, type: 3}
-      Name: 
-      Desc: 
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 16
+      Sprite: {fileID: 21300000, guid: c24c5872e76eb024eb5d16ed589da1b4, type: 3}
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 19
+      Sprite: {fileID: 21300000, guid: 47acdac93fae81548936db0f26c72e50, type: 3}
+      Name:
+      Desc:
+      HasLevel: 0
+      LevelSprite: []
+    - IgnoreCivId: 0
+      IgnoreForceId: 0
+      IsGridSpType: 0
+      GridSpType: 0
+      CivId: 3
+      ForceId: 3
+      OnlyCarryGiant: 1
+      CarryGiantType: 20
+      Sprite: {fileID: 21300000, guid: 74ad98c2f4cdf3541822658acc86f5c9, type: 3}
+      Name:
+      Desc:
      HasLevel: 0
      LevelSprite: []
    ProjectileType: 1
@ -4941,7 +5175,7 @@ MonoBehaviour:
    MoveRange: 3
    AttackRange: 1
    Cost: 0
-    Skills: 20000000e5000000e7000000e9000000fb000000
+    Skills: 20000000e5000000e7000000e9000000fb0000000c000000
    ActionIds: []
    Sprite: {fileID: 21300000, guid: 2402fd4a0df809349bab2260b42a3d5b, type: 3}
    IsSpriteVarient: 0
@ -4967,7 +5201,7 @@ MonoBehaviour:
    MoveRange: 3
    AttackRange: 1
    Cost: 0
-    Skills: 20000000e5000000e7000000e9000000ea000000fb000000
+    Skills: 20000000e5000000e7000000e9000000ea000000fb0000000c000000
    ActionIds: []
    Sprite: {fileID: 21300000, guid: 2402fd4a0df809349bab2260b42a3d5b, type: 3}
    IsSpriteVarient: 0
--- a/Unity/Assets/Resources/Export/Multilingual.asset
+++ b/Unity/Assets/Resources/Export/Multilingual.asset
@ -362149,61 +362149,6 @@ MonoBehaviour:
    IsSpecialTerm: 0
    Color: 
    Icon: 
-  - ID: 18790
-    ZH: English
-    TDZH: 
-    EN: 
-    JP: 
-    KR: 
-    RU: 
-    ES: 
-    PT: 
-    FR: 
-    IsProperNoun: 0
-    IsDialogue: 0
-    DialogueSpeaker: 
-    IsDeprecated: 0
-    IsCustom: 0
-    IsSpecialTerm: 1
-    Color: 
-    Icon: 
-  - ID: 18791
-    ZH: Chinese
-    TDZH: 
-    EN: 
-    JP: 
-    KR: 
-    RU: 
-    ES: 
-    PT: 
-    FR: 
-    IsProperNoun: 0
-    IsDialogue: 0
-    DialogueSpeaker: 
-    IsDeprecated: 0
-    IsCustom: 0
-    IsSpecialTerm: 1
-    Color: 
-    Icon: 
-  - ID: 18792
-    ZH: Heads-up! The current version of the game is in **<Chinese >**only.**< English
-      >**and more languages are on the way. Thank you for your patience and support!
-    TDZH: 
-    EN: 
-    JP: 
-    KR: 
-    RU: 
-    ES: 
-    PT: 
-    FR: 
-    IsProperNoun: 0
-    IsDialogue: 0
-    DialogueSpeaker: 
-    IsDeprecated: 0
-    IsCustom: 0
-    IsSpecialTerm: 0
-    Color: 
-    Icon: 
  - ID: 18793
    ZH: "\u5BF9\u654C\u65B9\u4E0D\u53EF\u89C1\uFF0C\u79FB\u52A8\u65F6\u65E0\u89C6\u654C\u63A7\u3002\u975E\u79FB\u52A8\u884C\u4E3A\u4F1A\u6253\u7834\u8BE5\u72B6\u6001\u3002"
    TDZH: 
@ -362222,4 +362167,95 @@ MonoBehaviour:
    IsSpecialTerm: 0
    Color: 
    Icon: 
+  - ID: 18794
+    ZH: ' English '
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 1
+    Color: 
+    Icon: 
+  - ID: 18795
+    ZH: 'Chinese '
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 1
+    Color: 
+    Icon: 
+  - ID: 18796
+    ZH: Heads-up! The current version of the game is in **<18795>**only.**<18794>**and
+      more languages are on the way. Thank you for your patience and support!
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18797
+    ZH: "\u82F1\u96C4\u6218\u8230Lv.0"
+    TDZH: 
+    EN: 
+    JP: 
+    KR: 
+    RU: 
+    ES: 
+    PT: 
+    FR: 
+    IsProperNoun: 0
+    IsDialogue: 0
+    DialogueSpeaker: 
+    IsDeprecated: 0
+    IsCustom: 0
+    IsSpecialTerm: 0
+    Color: 
+    Icon: 
+  - ID: 18798
+    ZH: "\u82F1\u96C4\u6218\u8230Lv.0\uFF0C\u7B49\u7EA7\u6E90\u4E8E\u8239\u4E0A\u82F1\u96C4\u7B49\u7EA7\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/UnitTypeDataAssets.asset
+++ b/Unity/Assets/Resources/Export/UnitTypeDataAssets.asset
@ -2307,8 +2307,8 @@ MonoBehaviour:
    ChessType: 0
    GiantCivId: 0
    GiantForceId: 0
-    Name: 16871
-    Desc: 16872
+    Name: 18797
+    Desc: 18798
    LandType: 2
    NoMaxHealth: 1
    MaxHealth: 50
@ -2463,8 +2463,8 @@ MonoBehaviour:
    ChessType: 0
    GiantCivId: 0
    GiantForceId: 0
-    Name: 16873
-    Desc: 16874
+    Name: 16871
+    Desc: 16872
    LandType: 2
    NoMaxHealth: 1
    MaxHealth: 50
@ -2619,8 +2619,8 @@ MonoBehaviour:
    ChessType: 0
    GiantCivId: 0
    GiantForceId: 0
-    Name: 16875
-    Desc: 16876
+    Name: 16873
+    Desc: 16874
    LandType: 2
    NoMaxHealth: 1
    MaxHealth: 50
@ -2775,8 +2775,8 @@ MonoBehaviour:
    ChessType: 0
    GiantCivId: 0
    GiantForceId: 0
-    Name: 16877
-    Desc: 16878
+    Name: 16875
+    Desc: 16876
    LandType: 2
    NoMaxHealth: 1
    MaxHealth: 50
@ -4941,7 +4941,7 @@ MonoBehaviour:
    MoveRange: 3
    AttackRange: 1
    Cost: 0
-    Skills: 20000000e5000000e7000000e9000000fb000000
+    Skills: 20000000e5000000e7000000e9000000fb0000000c000000
    ActionIds: []
    Sprite: {fileID: 21300000, guid: 2402fd4a0df809349bab2260b42a3d5b, type: 3}
    IsSpriteVarient: 0
@ -4967,7 +4967,7 @@ MonoBehaviour:
    MoveRange: 3
    AttackRange: 1
    Cost: 0
-    Skills: 20000000e5000000e7000000e9000000ea000000fb000000
+    Skills: 20000000e5000000e7000000e9000000ea000000fb0000000c000000
    ActionIds: []
    Sprite: {fileID: 21300000, guid: 2402fd4a0df809349bab2260b42a3d5b, type: 3}
    IsSpriteVarient: 0
--- a/Unity/Assets/Resources/Prefab/UI/Outside/UIOutsideMenu.prefab
+++ b/Unity/Assets/Resources/Prefab/UI/Outside/UIOutsideMenu.prefab
@ -1026,7 +1026,7 @@ MonoBehaviour:
  Ban: 0
  NoExport: 0
  FontBan: 0
-  ID: 18792
+  ID: 18796
  FontID: 0
  TextCfg:
  - Type: 1
--- a/Unity/Assets/Scripts/TH1_Logic/AI/AIActionGenerator.cs
+++ b/Unity/Assets/Scripts/TH1_Logic/AI/AIActionGenerator.cs
@ -601,11 +601,11 @@ namespace Logic.AI
                }

                // TODO: 暂时屏蔽 Indian/Satori 阵营的英雄选择
-                if (data.TargetParam.PlayerData.CivEnum == CivEnum.Indian)
+                //if (data.TargetParam.PlayerData.CivEnum == CivEnum.Indian)
                {
                    // Indian 阵营 AI 不允许选择英雄
                }
-                else
+                //else
                {
                    foreach (var action in actions)
                    {
--- a/Unity/Assets/Scripts/TH1_Logic/CultureCard/CultureCard.cs
+++ b/Unity/Assets/Scripts/TH1_Logic/CultureCard/CultureCard.cs
@ -193,7 +193,7 @@ namespace RuntimeData

        public override float GetHeroCostDiscount(MapData mapData, PlayerData playerData)
        {
-            return 0.1f;
+            return 0.2f;
        }
    }

--- a/Unity/Assets/Scripts/TH1_UI/HintUI/HintUI.cs
+++ b/Unity/Assets/Scripts/TH1_UI/HintUI/HintUI.cs
@ -163,8 +163,22 @@ namespace TH1_UI.HintUI
        private void OnShowHeroHintPanel(ShowHeroHintPanelEvent e)
        {
            if (_heroHintPanelGO == null || _heroHintPanel == null) return;
-            // 固定期间忽略所有新的触发
-            if (HeroHintPanel.IsPinned) return;
+
+            // 如果当前已固定，新触发也是固定请求（点击了另一个GiantUpgradeText trigger）
+            // 则先关闭当前面板，再显示新的
+            if (HeroHintPanel.IsPinned)
+            {
+                if (e.Pinned)
+                {
+                    _heroHintPanelGO.SetActive(false);
+                    HeroHintPanel.IsPinned = false;
+                }
+                else
+                {
+                    // 固定期间忽略hover预览
+                    return;
+                }
+            }

            _heroHintPanel.SetHeroInfo(e.GiantType);
            _heroHintPanelGO.SetActive(true);