美术资产更新

This commit is contained in:
daixiawu 2025-07-18 02:43:08 +08:00
parent 6d69f15a97
commit 9813eac467
45 changed files with 6777 additions and 9308 deletions

Binary file not shown.

File diff suppressed because one or more lines are too long

BIN
Tools/test.xlsx Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 KiB

View File

@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: 52cbf516bd43e534ba898859081cef6e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
- serializedVersion: 3
buildTarget: Server
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:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 2.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 2.9 MiB

View File

@ -3,7 +3,7 @@ guid: 97c72485568b83642bf8554406688eb0
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
@ -93,6 +93,19 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
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: []

View File

@ -3,7 +3,7 @@ guid: d289cbe57dd12a445a59867833aadca1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
@ -93,6 +93,19 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
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: []

View File

@ -3,7 +3,7 @@ guid: 181dc999d49b1b74ba443cdc3039c8ea
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
@ -93,6 +93,19 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
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: []

View File

@ -15,16 +15,16 @@ MonoBehaviour:
LibraryGiantList:
- GiantType: 2
Name: "\u857E\u7C73\u8389\u4E9A \xB7 \u65AF\u5361\u96F7\u7279"
Desc: "\u9970\u6F14<color=red>\u5965\u897F\u91CC\u65AF</color>\u7684\u4EBA\u7C7B\u5C11\u5973\u3002\u5979\u672C\u662F\u7EA2\u9B54\u9986\u670D\u4F8D\u857E\u7C73\u8389\u4E9A\xB7\u65AF\u5361\u96F7\u7279\u7684\u5973\u4EC6\u957F\uFF0C\u966A\u7740\u4EFB\u6027\u7684\u5927\u5C0F\u59D0\u4E00\u540C\u52A0\u5165\u6E38\u620F\u3002"
Diag: "\u5C45\u7136\u662F\u2026\u2026\u5965\u897F\u91CC\u65AF\u5417\uFF1F\u4E0D\u8FC7\u5927\u5C0F\u59D0\u662F\u4E0D\u4F1A\u6B7B\u7684\u5427\u3002\u6211\u53D8\u5F97\u591A\u4F59\u4E86\u5462\u3002"
Desc: "\u9970\u6F14<color=red>\u5965\u897F\u91CC\u65AF</color>\u7684\u9C9C\u7EA2\u5E7C\u6708\u3002\u5979\u662F\u7EA2\u9B54\u9986\u81F3\u9AD8\u65E0\u4E0A\u7684\u4E3B\u4EBA\uFF0C\u547D\u8FD0\u4E0E\u5A01\u4E25\u7684\u5316\u8EAB\uFF0C\u4E3A\u4E86\u90A3\u5EA7\u201C\u9AD8\u96C5\u201D\u7684\u51A0\u519B\u5956\u676F\u800C\u53C2\u8D5B\u3002"
Diag: "\u6211\u4E0D\u662F\u6CD5\u8001\u5417\uFF1F\u4E3A\u4EC0\u4E48\u5F00\u5C40\u662F\u4E2A\u51A5\u738B\u5440\uFF01\u771F\u4E0D\u5409\u5229\uFF0C\u91CD\u5F00\uFF0C\u6211\u8981\u91CD\u5F00\uFF01\uFF01"
EnglishName: REMILIA SCARLET
DiagColor: {r: 0.9176471, g: 0.34901962, b: 0.3529412, a: 1}
Illust: {fileID: 21300000, guid: d4661e5af1f33b94ea56ac7d7b30b512, type: 3}
AchivePreId: 201
- GiantType: 5
Name: "\u5E15\u79CB\u8389 \xB7 \u8BFA\u857E\u59EC"
Desc: "\u9970\u6F14<color=red>\u514B\u91CC\u6B27\u5E15\u7279\u62C9</color>\u7684\u4EBA\u7C7B\u5C11\u5973\u3002\u5979\u672C\u662F\u7EA2\u9B54\u9986\u670D\u4F8D\u857E\u7C73\u8389\u4E9A\xB7\u65AF\u5361\u96F7\u7279\u7684\u5973\u4EC6\u957F\uFF0C\u966A\u7740\u4EFB\u6027\u7684\u5927\u5C0F\u59D0\u4E00\u540C\u52A0\u5165\u6E38\u620F\u3002"
Diag: "\u5C45\u7136\u662F\u2026\u2026\u8273\u540E\uFF1F\u4E0D\u8FC7\u5927\u5C0F\u59D0\u662F\u4E0D\u4F1A\u6B7B\u7684\u5427\u3002\u6211\u53D8\u5F97\u591A\u4F59\u4E86\u5462\u3002"
Desc: "\u9970\u6F14<color=red>\u514B\u91CC\u6B27\u5E15\u7279\u62C9</color>\u7684\u9B54\u5973\u3002\u5979\u662F\u7EA2\u9B54\u9986\u5730\u4E0B\u5927\u56FE\u4E66\u9986\u7684\u8D24\u8005\uFF0C\u5BF9\u4E00\u5207\u7EB7\u4E89\u6BEB\u65E0\u5174\u8DA3\uFF0C\u4EE5\u6269\u59273\u500D\u56FE\u4E66\u9986\u4E3A\u6761\u4EF6\u7B54\u5E94\u857E\u7C73\u4E00\u8D77\u53C2\u8D5B\u3002"
Diag: "\u7528\u201C\u9B45\u529B\u201D\u4EA4\u6D89??\u627E\u9519\u4EBA\u4E86\u5462\u2026\u2026\u770B\u5728\u7687\u5BB6\u56FE\u4E66\u9986\u7684\u4EFD\u4E0A\uFF0C\u6211\u52C9\u5F3A\u63A5\u53D7\u3002"
EnglishName: PATCHOULI KNOWLEDGE
DiagColor: {r: 0.90196085, g: 0, b: 0.8431373, a: 1}
Illust: {fileID: 21300000, guid: 41bf66abdaa83a74e9a9b6cff7cda10f, type: 3}
@ -39,16 +39,16 @@ MonoBehaviour:
AchivePreId: 203
- GiantType: 1
Name: "\u8299\u5170\u6735\u9732 \xB7 \u65AF\u5361\u96F7\u7279"
Desc: "\u9970\u6F14<color=red>\u8D5B\u7279</color>\u7684\u4EBA\u7C7B\u5C11\u5973\u3002\u5979\u672C\u662F\u7EA2\u9B54\u9986\u670D\u4F8D\u857E\u7C73\u8389\u4E9A\xB7\u65AF\u5361\u96F7\u7279\u7684\u5973\u4EC6\u957F\uFF0C\u966A\u7740\u4EFB\u6027\u7684\u5927\u5C0F\u59D0\u4E00\u540C\u52A0\u5165\u6E38\u620F\u3002"
Diag: "\u5C45\u7136\u662F\u2026\u2026\u8D5B\u7279\uFF1F\u4E0D\u8FC7\u5927\u5C0F\u59D0\u662F\u4E0D\u4F1A\u6B7B\u7684\u5427\u3002\u6211\u53D8\u5F97\u591A\u4F59\u4E86\u5462\u3002"
Desc: "\u9970\u6F14<color=red>\u8D5B\u7279</color>\u7684\u6076\u9B54\u4E4B\u59B9\u3002\u5979\u662F\u88AB\u56DA\u7981\u4E8E\u7EA2\u9B54\u9986\u5730\u4E0B\u5BA4\u7684\u7EC8\u6781\u79D8\u5BC6\uFF0C\u7EAF\u7CB9\u7684\u7834\u574F\u5316\u8EAB\u3002\u857E\u7C73\u4E3A\u5979\u4EA4\u4E864\u500D\u7684\u62A5\u540D\u8D39\u3002"
Diag: "\u59D0\u59D0\u5927\u4EBA\u5F53\u4E86\u90A3\u4E48\u4E45\u7684\u6CD5\u8001\uFF0C\u4E00\u5B9A\u7D2F\u4E86\u5427\uFF1F\u563B\u563B\uFF0C\u5C31\u7531\u8299\u5170\u66FF\u4F60\u2026\u2026"
EnglishName: FLANDRE SCARLET
DiagColor: {r: 0.9176471, g: 0.34901962, b: 0.3529412, a: 1}
Illust: {fileID: 21300000, guid: aec531e396936d143a506d19ceb156bc, type: 3}
AchivePreId: 204
- GiantType: 4
Name: "\u7EA2\u7F8E\u94C3"
Desc: "\u9970\u6F14<color=red>\u8377\u9C81\u65AF</color>\u7684\u4EBA\u7C7B\u5C11\u5973\u3002\u5979\u672C\u662F\u7EA2\u9B54\u9986\u670D\u4F8D\u857E\u7C73\u8389\u4E9A\xB7\u65AF\u5361\u96F7\u7279\u7684\u5973\u4EC6\u957F\uFF0C\u966A\u7740\u4EFB\u6027\u7684\u5927\u5C0F\u59D0\u4E00\u540C\u52A0\u5165\u6E38\u620F\u3002"
Diag: "\u5C45\u7136\u662F\u2026\u2026\u8377\u9C81\u65AF\uFF1F\u4E0D\u8FC7\u5927\u5C0F\u59D0\u662F\u4E0D\u4F1A\u6B7B\u7684\u5427\u3002\u6211\u53D8\u5F97\u591A\u4F59\u4E86\u5462\u3002"
Desc: "\u9970\u6F14<color=red>\u8377\u9C81\u65AF</color>\u7684\u6B66\u672F\u5BB6\u3002\u5979\u662F\u7EA2\u9B54\u9986\u6700\u5FE0\u8BDA\u7684\u95E8\u536B\uFF0C\u56E0\u4E3A\u5728\u5DE5\u4F5C\u671F\u95F4\u7761\u89C9\uFF0C\u9192\u6765\u7684\u65F6\u5019\u5C31\u53D1\u73B0\u81EA\u5DF1\u8EAB\u5728\u6BD4\u8D5B\u73B0\u573A\u4E86\u3002"
Diag: "\u4E3A\u5927\u5C0F\u59D0\u590D\u4EC7\uFF1F\u8D74\u6C64\u8E48\u2026\u2026\u4F60\u8BF4\u590D\u4EC7\u7684\u5BF9\u8C61\u662F\u59B9\u59B9\u5927\u4EBA\uFF1F\uFF01\u6211\u3001\u6211\u8FD8\u5F97\u53BB\u770B\u95E8\u2026\u2026"
EnglishName: HONG MEILING
DiagColor: {r: 0.9176471, g: 0.34901962, b: 0.3529412, a: 1}
Illust: {fileID: 21300000, guid: c5feb7e3a8bc4384e955e9fa2218fc25, type: 3}
@ -56,7 +56,8 @@ MonoBehaviour:
LibraryWonderList:
- WonderLibraryID: 0
Name: "\u5362\u514B\u7D22\u795E\u5E99"
Desc: peace
Desc: "\u5E95\u6BD4\u65AF\u6700\u5B8F\u4F1F\u7684\u9732\u5929\u535A\u7269\u9986\uFF0C\u65B0\u738B\u56FD\u65F6\u671F\u6CD5\u8001\u7684\u732E\u793C\uFF0C\u65E8\u5728\u4E3E\u884C\u795E\u5723\u7684\u201C\u5965\u4F69\u7279\u8282\u201D\u5E86\u5178\u3002\u540E\u7ECF\u5343\u5E74\u6F14\u53D8\uFF0C\u878D\u5408\u591A\u79CD\u6587\u660E\u5370\u8BB0\uFF0C\u81F3\u4ECA\u5C79\u7ACB\u3002
\t\u5728\u6E38\u620F\u4E2D\uFF0C\u4F5C\u4E3A<color=red>\u548C\u5E73\u7C7B\u5947\u89C2</color>\uFF0C\u524D\u7F6E\u6761\u4EF6\u5F00\u542F\u540E\uFF0C5\u56DE\u5408\u672A\u4E3B\u52A8\u653B\u51FB\u5373\u53EF\u83B7\u5F97\uFF0C\u63D0\u4F9B3\u70B9\u57CE\u5E02\u7ECF\u9A8C\u3002"
Diags:
- Diag:
- "\u4E03\u5341\u4E07\u5377?!\u4F60\u53EF\u522B\u8BA9\u5C0F\u6076\u9B54\u7D2F\u6B7B\u54E6\uFF0C\u4F20\u51FA\u53BB\u574F\u4E86\u6211\u7EA2\u9B54\u9986\u7684\u540D\u58F0\u3002"
@ -99,7 +100,8 @@ MonoBehaviour:
AchivePreId: 302
- WonderLibraryID: 2
Name: "\u5B5F\u83F2\u65AF\u8001\u57CE"
Desc: trade
Desc: "\u53E4\u57C3\u53CA\u9996\u4E2A\u7EDF\u4E00\u738B\u671D\u7684\u9996\u90FD\uFF0C\u4F20\u8BF4\u7531\u7F8E\u5C3C\u65AF\u738B\u6240\u5EFA\uFF0C\u65E8\u5728\u6210\u4E3A\u4E0A\u4E0B\u57C3\u53CA\u7684\u7EDF\u6CBB\u6838\u5FC3\u3002\u540E\u867D\u8363\u5149\u4E0D\u518D\uFF0C\u5176\u5E9F\u589F\u4ECD\u8BC9\u8BF4\u7740\u4E09\u5343\u5E74\u7684\u5E1D\u56FD\u8F89\u714C\u3002
\t\u5728\u6E38\u620F\u4E2D\uFF0C\u4F5C\u4E3A<color=red>\u8D38\u6613\u7C7B\u5947\u89C2</color>\uFF0C\u524D\u7F6E\u6761\u4EF6\u5F00\u542F\u540E\uFF0C\u8054\u901A5\u4E2A\u57CE\u5E02\u540E\u5373\u53EF\u83B7\u5F97\uFF0C\u63D0\u4F9B3\u70B9\u57CE\u5E02\u7ECF\u9A8C\u3002"
Diags:
- Diag:
- "\u4E03\u5341\u4E07\u5377?!\u4F60\u53EF\u522B\u8BA9\u5C0F\u6076\u9B54\u7D2F\u6B7B\u54E6\uFF0C\u4F20\u51FA\u53BB\u574F\u4E86\u6211\u7EA2\u9B54\u9986\u7684\u540D\u58F0\u3002"
@ -120,7 +122,8 @@ MonoBehaviour:
AchivePreId: 303
- WonderLibraryID: 3
Name: "\u5409\u8428\u5927\u91D1\u5B57\u5854"
Desc: wealth
Desc: "\u53E4\u4EE3\u4E16\u754C\u4E03\u5927\u5947\u8FF9\u7684\u6700\u540E\u9057\u5B58\uFF0C\u6CD5\u8001\u80E1\u592B\u4E3A\u81EA\u5DF1\u4FEE\u5EFA\u7684\u6C38\u6052\u5C45\u6240\uFF0C\u65E8\u5728\u4F5C\u4E3A\u901A\u5F80\u795E\u754C\u7684\u9636\u68AF\u3002\u867D\u5386\u7ECF\u76D7\u6398\uFF0C\u5176\u96C4\u4F1F\u7ED3\u6784\u5C79\u7ACB\u6570\u5343\u5E74\u4E0D\u5012\u3002
\t\u5728\u6E38\u620F\u4E2D\uFF0C\u4F5C\u4E3A<color=red>\u8D22\u5BCC\u7C7B\u5947\u89C2</color>\uFF0C\u524D\u7F6E\u6761\u4EF6\u5F00\u542F\u540E\uFF0C\u56DE\u5408\u5F00\u59CB\u65F6\u62E5\u6709100\u679A\u53CA\u4EE5\u4E0A\u91D1\u5E01\u5373\u53EF\u83B7\u5F97\uFF0C\u63D0\u4F9B3\u70B9\u57CE\u5E02\u7ECF\u9A8C\u3002"
Diags:
- Diag:
- "\u4E03\u5341\u4E07\u5377?!\u4F60\u53EF\u522B\u8BA9\u5C0F\u6076\u9B54\u7D2F\u6B7B\u54E6\uFF0C\u4F20\u51FA\u53BB\u574F\u4E86\u6211\u7EA2\u9B54\u9986\u7684\u540D\u58F0\u3002"
@ -141,7 +144,8 @@ MonoBehaviour:
AchivePreId: 304
- WonderLibraryID: 4
Name: "\u963F\u5E03\u8F9B\u8D1D\u5927\u795E\u5E99"
Desc: power
Desc: "\u62C9\u7F8E\u897F\u65AF\u4E8C\u4E16\u51FF\u5C71\u800C\u5EFA\u7684\u6743\u529B\u4E30\u7891\uFF0C\u5C3C\u7F57\u6CB3\u5357\u5883\u7684\u6C38\u6052\u5BA3\u544A\uFF0C\u65E8\u5728\u7EAA\u5FF5\u6218\u529F\u5E76\u5A01\u6151\u90BB\u90A6\u3002\u540E\u56E0\u6C34\u575D\u5DE5\u7A0B\uFF0C\u7531\u4E16\u754C\u534F\u529B\u6574\u4F53\u8FC1\u79FB\uFF0C\u518D\u521B\u5947\u8FF9\u3002
\t\u5728\u6E38\u620F\u4E2D\uFF0C\u4F5C\u4E3A<color=red>\u6218\u4E89\u7C7B\u5947\u89C2</color>\uFF0C\u524D\u7F6E\u6761\u4EF6\u5F00\u542F\u540E\uFF0C\u51FB\u674010\u540D\u654C\u65B9\u5355\u4F4D\u540E\u5373\u53EF\u83B7\u5F97\uFF0C\u63D0\u4F9B3\u70B9\u57CE\u5E02\u7ECF\u9A8C\u3002"
Diags:
- Diag:
- "\u4E03\u5341\u4E07\u5377?!\u4F60\u53EF\u522B\u8BA9\u5C0F\u6076\u9B54\u7D2F\u6B7B\u54E6\uFF0C\u4F20\u51FA\u53BB\u574F\u4E86\u6211\u7EA2\u9B54\u9986\u7684\u540D\u58F0\u3002"
@ -162,7 +166,8 @@ MonoBehaviour:
AchivePreId: 305
- WonderLibraryID: 5
Name: "\u72EE\u8EAB\u4EBA\u9762\u50CF"
Desc: park
Desc: "\u5409\u8428\u9AD8\u539F\u6700\u53E4\u8001\u7684\u6C89\u9ED8\u5B88\u62A4\u8005\uFF0C\u4E16\u4E0A\u6700\u5927\u7684\u6574\u4F53\u77F3\u96D5\uFF0C\u65E8\u5728\u7ED3\u5408\u738B\u6743\u4E0E\u795E\u529B\u62A4\u536B\u6CD5\u8001\u9675\u5BDD\u3002\u66FE\u88AB\u9EC4\u6C99\u63A9\u57CB\u5343\u5E74\uFF0C\u9192\u6765\u540E\u6210\u4E3A\u57C3\u53CA\u7684\u6C38\u6052\u8C61\u5F81\u3002
\t\u5728\u6E38\u620F\u4E2D\uFF0C\u4F5C\u4E3A<color=red>\u6587\u5316\u7C7B\u5947\u89C2</color>\uFF0C\u524D\u7F6E\u6761\u4EF6\u5F00\u542F\u540E\uFF0C\u62E5\u6709\u4E00\u5EA7Lv6\u57CE\u5E02\u540E\u5373\u53EF\u83B7\u5F97\uFF0C\u63D0\u4F9B3\u70B9\u57CE\u5E02\u7ECF\u9A8C\u3002"
Diags:
- Diag:
- "\u4E03\u5341\u4E07\u5377?!\u4F60\u53EF\u522B\u8BA9\u5C0F\u6076\u9B54\u7D2F\u6B7B\u54E6\uFF0C\u4F20\u51FA\u53BB\u574F\u4E86\u6211\u7EA2\u9B54\u9986\u7684\u540D\u58F0\u3002"
@ -183,7 +188,8 @@ MonoBehaviour:
AchivePreId: 306
- WonderLibraryID: 6
Name: "\u5965\u91CC\u897F\u65AF\u795E\u5E99"
Desc: eye
Desc: "\u963F\u62DC\u591A\u65AF\u6700\u795E\u79D8\u7684\u5730\u4E0B\u5723\u6BBF\uFF0C\u7531\u6CD5\u8001\u585E\u63D0\u4E00\u4E16\u5174\u5EFA\uFF0C\u65E8\u5728\u4F5C\u4E3A\u51A5\u795E\u5965\u897F\u91CC\u65AF\u7684\u8C61\u5F81\u6027\u9675\u5893\u3002\u5176\u771F\u5B9E\u5E74\u4EE3\u4E0E\u7528\u9014\u81F3\u4ECA\u4ECD\u662F\u8003\u53E4\u5B66\u4E0A\u7684\u672A\u89E3\u4E4B\u8C1C\u3002
\t\u5728\u6E38\u620F\u4E2D\uFF0C\u4F5C\u4E3A<color=red>\u63A2\u7D22\u7C7B\u5947\u89C2</color>\uFF0C\u524D\u7F6E\u6761\u4EF6\u5F00\u542F\u540E\uFF0C\u62E5\u67094\u5EA7\u7ED3\u754C\u5854\u7684\u89C6\u91CE\u540E\u5373\u53EF\u83B7\u5F97\uFF0C\u63D0\u4F9B3\u70B9\u57CE\u5E02\u7ECF\u9A8C\u3002"
Diags:
- Diag:
- "\u4E03\u5341\u4E07\u5377?!\u4F60\u53EF\u522B\u8BA9\u5C0F\u6076\u9B54\u7D2F\u6B7B\u54E6\uFF0C\u4F20\u51FA\u53BB\u574F\u4E86\u6211\u7EA2\u9B54\u9986\u7684\u540D\u58F0\u3002"

View File

@ -59,7 +59,7 @@ MonoBehaviour:
CivName: "\u666E\u9C81\u58EB\u5E1D\u56FD"
ForceName: "\u516B\u5742\u795E\u5948\u5B50"
LeaderName: "\u516B\u5742\u795E\u5948\u5B50"
LeaderIllustration: {fileID: 21300000, guid: 3756265d254e8e542b0c198d11bf75d4, type: 3}
LeaderIllustration: {fileID: 21300000, guid: 7b419554ffed25f4fa94a867715388e6, type: 3}
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
TechStart: 0000000010000000
Color: {r: 0.2784314, g: 0.30588236, b: 0.36862746, a: 1}
@ -105,7 +105,7 @@ MonoBehaviour:
CivName: "\u5317\u6D77\u5E1D\u56FD"
ForceName: "\u535A\u4E3D\u7075\u68A6"
LeaderName: "\u535A\u4E3D\u7075\u68A6"
LeaderIllustration: {fileID: 21300000, guid: 7827e23a317aaac4c8d5131a85e63094, type: 3}
LeaderIllustration: {fileID: 21300000, guid: 52cbf516bd43e534ba898859081cef6e, type: 3}
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
TechStart: 0000000015000000
Color: {r: 0.5254902, g: 0.25882354, b: 0, a: 1}
@ -125,7 +125,7 @@ MonoBehaviour:
CivName: "\u4E0D\u5217\u98A0\u5E1D\u56FD"
ForceName: "\u5723\u767D\u83B2"
LeaderName: "\u5723\u767D\u83B2"
LeaderIllustration: {fileID: 21300000, guid: 41bf66abdaa83a74e9a9b6cff7cda10f, type: 3}
LeaderIllustration: {fileID: 21300000, guid: 52cbf516bd43e534ba898859081cef6e, type: 3}
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
TechStart: 0000000012000000
Color: {r: 0.3019608, g: 0.5568628, b: 0.05490196, a: 1}
@ -150,7 +150,7 @@ MonoBehaviour:
CivName: "\u8428\u73CA\u5E1D\u56FD"
ForceName: "\u4E30\u806A\u8033\u795E\u5B50"
LeaderName: "\u4E30\u806A\u8033\u795E\u5B50"
LeaderIllustration: {fileID: 21300000, guid: 031b6571f7cb19549a2f0f97b386481f, type: 3}
LeaderIllustration: {fileID: 21300000, guid: 52cbf516bd43e534ba898859081cef6e, type: 3}
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
TechStart: 0000000005000000
Color: {r: 0.62352943, g: 0.003921569, b: 0.7137255, a: 1}
@ -172,7 +172,7 @@ MonoBehaviour:
CivName: "\u62DC\u5360\u5EAD\u5E1D\u56FD"
ForceName: "\u65E5\u767D\u6B8B\u65E0"
LeaderName: "\u65E5\u767D\u6B8B\u65E0"
LeaderIllustration: {fileID: 21300000, guid: c5feb7e3a8bc4384e955e9fa2218fc25, type: 3}
LeaderIllustration: {fileID: 21300000, guid: 52cbf516bd43e534ba898859081cef6e, type: 3}
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
TechStart: 0000000013000000
Color: {r: 0, g: 0.61960787, b: 0.65882355, a: 1}

View File

@ -0,0 +1,16 @@
%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: 7d7d9ea4126f9ea4e8a97aa2149fd821, type: 3}
m_Name: TextDataAssets
m_EditorClassIdentifier:
WinUIWinText: "\u80DC\u5229!"
WinUILoseText: "\u5931\u8D25..."

View File

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

View File

@ -15,16 +15,16 @@ MonoBehaviour:
LibraryGiantList:
- GiantType: 2
Name: 1044
Desc: 1050
Diag: 1051
Desc: 1110
Diag: 1111
EnglishName: REMILIA SCARLET
DiagColor: {r: 0.9176471, g: 0.34901962, b: 0.3529412, a: 1}
Illust: {fileID: 21300000, guid: d4661e5af1f33b94ea56ac7d7b30b512, type: 3}
AchivePreId: 201
- GiantType: 5
Name: 1046
Desc: 1052
Diag: 1053
Desc: 1112
Diag: 1113
EnglishName: PATCHOULI KNOWLEDGE
DiagColor: {r: 0.90196085, g: 0, b: 0.8431373, a: 1}
Illust: {fileID: 21300000, guid: 41bf66abdaa83a74e9a9b6cff7cda10f, type: 3}
@ -39,16 +39,16 @@ MonoBehaviour:
AchivePreId: 203
- GiantType: 1
Name: 1047
Desc: 1054
Diag: 1055
Desc: 1114
Diag: 1115
EnglishName: FLANDRE SCARLET
DiagColor: {r: 0.9176471, g: 0.34901962, b: 0.3529412, a: 1}
Illust: {fileID: 21300000, guid: aec531e396936d143a506d19ceb156bc, type: 3}
AchivePreId: 204
- GiantType: 4
Name: 38
Desc: 1056
Diag: 1057
Desc: 1116
Diag: 1117
EnglishName: HONG MEILING
DiagColor: {r: 0.9176471, g: 0.34901962, b: 0.3529412, a: 1}
Illust: {fileID: 21300000, guid: c5feb7e3a8bc4384e955e9fa2218fc25, type: 3}
@ -56,7 +56,7 @@ MonoBehaviour:
LibraryWonderList:
- WonderLibraryID: 0
Name: 302
Desc: 1100
Desc: 1118
Diags:
- Diag:
- "\u4E03\u5341\u4E07\u5377?!\u4F60\u53EF\u522B\u8BA9\u5C0F\u6076\u9B54\u7D2F\u6B7B\u54E6\uFF0C\u4F20\u51FA\u53BB\u574F\u4E86\u6211\u7EA2\u9B54\u9986\u7684\u540D\u58F0\u3002"
@ -98,7 +98,7 @@ MonoBehaviour:
AchivePreId: 302
- WonderLibraryID: 2
Name: 303
Desc: 1102
Desc: 1119
Diags:
- Diag:
- "\u4E03\u5341\u4E07\u5377?!\u4F60\u53EF\u522B\u8BA9\u5C0F\u6076\u9B54\u7D2F\u6B7B\u54E6\uFF0C\u4F20\u51FA\u53BB\u574F\u4E86\u6211\u7EA2\u9B54\u9986\u7684\u540D\u58F0\u3002"
@ -119,7 +119,7 @@ MonoBehaviour:
AchivePreId: 303
- WonderLibraryID: 3
Name: 304
Desc: 1103
Desc: 1120
Diags:
- Diag:
- "\u4E03\u5341\u4E07\u5377?!\u4F60\u53EF\u522B\u8BA9\u5C0F\u6076\u9B54\u7D2F\u6B7B\u54E6\uFF0C\u4F20\u51FA\u53BB\u574F\u4E86\u6211\u7EA2\u9B54\u9986\u7684\u540D\u58F0\u3002"
@ -140,7 +140,7 @@ MonoBehaviour:
AchivePreId: 304
- WonderLibraryID: 4
Name: 305
Desc: 1104
Desc: 1121
Diags:
- Diag:
- "\u4E03\u5341\u4E07\u5377?!\u4F60\u53EF\u522B\u8BA9\u5C0F\u6076\u9B54\u7D2F\u6B7B\u54E6\uFF0C\u4F20\u51FA\u53BB\u574F\u4E86\u6211\u7EA2\u9B54\u9986\u7684\u540D\u58F0\u3002"
@ -161,7 +161,7 @@ MonoBehaviour:
AchivePreId: 305
- WonderLibraryID: 5
Name: 306
Desc: 1105
Desc: 1122
Diags:
- Diag:
- "\u4E03\u5341\u4E07\u5377?!\u4F60\u53EF\u522B\u8BA9\u5C0F\u6076\u9B54\u7D2F\u6B7B\u54E6\uFF0C\u4F20\u51FA\u53BB\u574F\u4E86\u6211\u7EA2\u9B54\u9986\u7684\u540D\u58F0\u3002"
@ -182,7 +182,7 @@ MonoBehaviour:
AchivePreId: 306
- WonderLibraryID: 6
Name: 307
Desc: 1106
Desc: 1123
Diags:
- Diag:
- "\u4E03\u5341\u4E07\u5377?!\u4F60\u53EF\u522B\u8BA9\u5C0F\u6076\u9B54\u7D2F\u6B7B\u54E6\uFF0C\u4F20\u51FA\u53BB\u574F\u4E86\u6211\u7EA2\u9B54\u9986\u7684\u540D\u58F0\u3002"

File diff suppressed because it is too large Load Diff

View File

@ -59,7 +59,7 @@ MonoBehaviour:
CivName: 225
ForceName: 190
LeaderName: 190
LeaderIllustration: {fileID: 21300000, guid: 3756265d254e8e542b0c198d11bf75d4, type: 3}
LeaderIllustration: {fileID: 21300000, guid: 7b419554ffed25f4fa94a867715388e6, type: 3}
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
TechStart: 0000000010000000
Color: {r: 0.2784314, g: 0.30588236, b: 0.36862746, a: 1}
@ -105,7 +105,7 @@ MonoBehaviour:
CivName: 475
ForceName: 476
LeaderName: 476
LeaderIllustration: {fileID: 21300000, guid: 7827e23a317aaac4c8d5131a85e63094, type: 3}
LeaderIllustration: {fileID: 21300000, guid: 52cbf516bd43e534ba898859081cef6e, type: 3}
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
TechStart: 0000000015000000
Color: {r: 0.5254902, g: 0.25882354, b: 0, a: 1}
@ -125,7 +125,7 @@ MonoBehaviour:
CivName: 477
ForceName: 478
LeaderName: 478
LeaderIllustration: {fileID: 21300000, guid: 41bf66abdaa83a74e9a9b6cff7cda10f, type: 3}
LeaderIllustration: {fileID: 21300000, guid: 52cbf516bd43e534ba898859081cef6e, type: 3}
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
TechStart: 0000000012000000
Color: {r: 0.3019608, g: 0.5568628, b: 0.05490196, a: 1}
@ -150,7 +150,7 @@ MonoBehaviour:
CivName: 479
ForceName: 480
LeaderName: 480
LeaderIllustration: {fileID: 21300000, guid: 031b6571f7cb19549a2f0f97b386481f, type: 3}
LeaderIllustration: {fileID: 21300000, guid: 52cbf516bd43e534ba898859081cef6e, type: 3}
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
TechStart: 0000000005000000
Color: {r: 0.62352943, g: 0.003921569, b: 0.7137255, a: 1}
@ -172,7 +172,7 @@ MonoBehaviour:
CivName: 481
ForceName: 482
LeaderName: 482
LeaderIllustration: {fileID: 21300000, guid: c5feb7e3a8bc4384e955e9fa2218fc25, type: 3}
LeaderIllustration: {fileID: 21300000, guid: 52cbf516bd43e534ba898859081cef6e, type: 3}
TechPool: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000
TechStart: 0000000013000000
Color: {r: 0, g: 0.61960787, b: 0.65882355, a: 1}

View File

@ -0,0 +1,16 @@
%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: 7d7d9ea4126f9ea4e8a97aa2149fd821, type: 3}
m_Name: TextDataAssets
m_EditorClassIdentifier:
WinUIWinText: 1108
WinUILoseText: 1109

View File

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

View File

@ -2060,12 +2060,12 @@ SpriteRenderer:
m_SortingLayerID: -124165537
m_SortingLayer: 5
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: e718364d92aa1be4d9f37b79d3b49d11, type: 3}
m_Sprite: {fileID: 21300000, guid: 1a89268611d83bd40824ade09439cd93, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 3.29, y: 4.32}
m_Size: {x: 0.68, y: 0.95}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1

File diff suppressed because it is too large Load Diff

View File

@ -179,6 +179,7 @@ namespace RuntimeData
//用于经典模式判断是否已经抵达31回合从而结束游戏
public bool CheckTimeEnd()
{
return false;
if(SelfPlayerData.Turn == 61)
return true;
return false;

View File

@ -143,21 +143,129 @@ public enum CityLibrary
Bhubaneswar,
Srinagar,
//挪威城市
Oslo, Bergen, Trondheim, Stavanger, Tromso, Kristiansand, Drammen, Fredrikstad, Skien, Bodo,
Haugesund, Arendal, Molde, Lillehammer, Hamar, Gjovik, Alta, Narvik, Sandefjord, Alesund,
Tonsberg, Halden, Moss, Honefoss, Kongsberg, Elverum, Steinkjer, Levanger, Voss, Forde,
Oslo,
Bergen,
Trondheim,
Stavanger,
Tromso,
Kristiansand,
Drammen,
Fredrikstad,
Skien,
Bodo,
Haugesund,
Arendal,
Molde,
Lillehammer,
Hamar,
Gjovik,
Alta,
Narvik,
Sandefjord,
Alesund,
Tonsberg,
Halden,
Moss,
Honefoss,
Kongsberg,
Elverum,
Steinkjer,
Levanger,
Voss,
Forde,
//英国城市
London, Birmingham, Manchester, Liverpool, Leeds, Sheffield, Bristol, Newcastle, Nottingham, Southampton,
Leicester, Portsmouth, York, Cambridge, Oxford, Exeter, Cardiff, Glasgow, Edinburgh, Belfast,
Swansea, Dundee, Aberdeen, Londonderry, Inverness, Carlisle, Bath, Norwich, Reading, Plymouth,
London,
Birmingham,
Manchester,
Liverpool,
Leeds,
Sheffield,
Bristol,
Newcastle,
Nottingham,
Southampton,
Leicester,
Portsmouth,
York,
Cambridge,
Oxford,
Exeter,
Cardiff,
Glasgow,
Edinburgh,
Belfast,
Swansea,
Dundee,
Aberdeen,
Londonderry,
Inverness,
Carlisle,
Bath,
Norwich,
Reading,
Plymouth,
//波斯城市
Persepolis, Susa, Ecbatana, Pasargadae, Rhagae, Istakhr, Shiraz, Isfahan, Tehran, Tabriz,
Mashhad, Qom, Hamadan, Kerman, Yazd, Ahvaz, BandarAbbas, Kermanshah, Zanjan, Sabzevar,
Neyshabur, Qazvin, Karaj, Arak, Borujerd, Sanandaj, Rasht, Ardabil, Kashan, Bushehr,
Persepolis,
Susa,
Ecbatana,
Pasargadae,
Rhagae,
Istakhr,
Shiraz,
Isfahan,
Tehran,
Tabriz,
Mashhad,
Qom,
Hamadan,
Kerman,
Yazd,
Ahvaz,
BandarAbbas,
Kermanshah,
Zanjan,
Sabzevar,
Neyshabur,
Qazvin,
Karaj,
Arak,
Borujerd,
Sanandaj,
Rasht,
Ardabil,
Kashan,
Bushehr,
//拜占庭
Constantinople, Nicaea, Antioch, Thessalonica, Trebizond, Ephesus, Smyrna, Heraclea, Adrianople, Nicomedia,
Chalcedon, Caesarea, Rhodes, Corinth, Athens, Dyrrachium, ThebesByzantine, Laodicea, Ancyra, Amasea,
Mystras, Philippi, Nysa, Tyana, Pergamon, Iconium, Miletus, Tralles, Seleucia, Cyrene
Constantinople,
Nicaea,
Antioch,
Thessalonica,
Trebizond,
Ephesus,
Smyrna,
Heraclea,
Adrianople,
Nicomedia,
Chalcedon,
Caesarea,
Rhodes,
Corinth,
Athens,
Dyrrachium,
ThebesByzantine,
Laodicea,
Ancyra,
Amasea,
Mystras,
Philippi,
Nysa,
Tyana,
Pergamon,
Iconium,
Miletus,
Tralles,
Seleucia,
Cyrene
}

View File

@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using Logic.Action;
using Logic.Multilingual;
using UnityEngine;
[Serializable]
[CreateAssetMenu(fileName = "TextDataAssets", menuName = "TH1 Game Data/Text Data Asset")]
public class TextDataAssets : ScriptableObject
{
[MultilingualField]public string WinUIWinText;
[MultilingualField]public string WinUILoseText;
}

View File

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

View File

@ -120,6 +120,8 @@ public class Table
public LibraryDataAssets LibraryDataAssets;
public ColorDataAssets ColorDataAssets;
public TextDataAssets TextDataAssets;
//public AchievementAsset AchievementAsset;
@ -177,6 +179,8 @@ public class Table
//不用导表
AnimDataAssets = Resources.Load<AnimDataAssets>("DataAssets/AnimDataAssets");
ColorDataAssets = Resources.Load<ColorDataAssets>("DataAssets/ColorDataAssets");
TextDataAssets = Resources.Load<TextDataAssets>("DataAssets/TextDataAssets");
//AchievementAsset = Resources.Load<AchievementAsset>("Export/AchievementAsset");
}

View File

@ -222,7 +222,7 @@ namespace Logic
Vector3 topRight = corners[2]; // 取右上角
// 位置设定到按钮右边偏移一点
hintRt.position = topRight + new Vector3(20f, 0f, 0f);
hintRt.position = topRight;// + new Vector3(-200f, 0f, 0f);
//处理action的情况

View File

@ -112,6 +112,9 @@ namespace Logic
DebugCenter.Instance.DebugLandThreshold = LandThreshold;
//播放初始音乐
AudioManager.Instance.PlayMusic("Main",0.5f,1f,true);
//TODO 提审包单独使用
MultilingualManager.Instance.ChangedMultilingual(MultilingualType.EN);
}

View File

@ -213,10 +213,10 @@ namespace TH1Renderer
SetHintCommonRecover(mapData,playerData,HintDataList);
int choose = 2;
if (Random.Range(0, 100) < 70)
if (Random.Range(0, 100) < 90)
{
choose = 1;
if(Random.Range(0, 70) < 20)
if(Random.Range(0, 90) < 50)
choose = 0;
}

View File

@ -78,7 +78,7 @@ public class HistoryUI
{
var row = ROTable.transform.GetChild(i).gameObject;
row.SetActive(true);
row.transform.GetChild(1).Find("Text").GetComponent<TextMeshProUGUI>().text = "30";
row.transform.GetChild(1).Find("Text").GetComponent<TextMeshProUGUI>().text = dataList[i].Turn.ToString();
row.transform.GetChild(2).Find("Text").GetComponent<TextMeshProUGUI>().text = dataList[i].Score.ToString();
row.transform.GetChild(3).Find("Text").GetComponent<TextMeshProUGUI>().text = "蕾米莉亚";
row.transform.GetChild(4).Find("Text").GetComponent<TextMeshProUGUI>().text = dataList[i].MapHeight + " × " + dataList[i].MapWidth;

View File

@ -15,6 +15,7 @@ public class LoseUI
public LoseUI(Main main, MapData mapData)
{
return;
_main = main;
_mapData = mapData;
ROLoseUI = UIManager.Instance.ROUIManager.transform.Find("LosePanel").gameObject;
@ -25,7 +26,7 @@ public class LoseUI
}
public void Update()
{
{return;
if (ROLoseUI.activeSelf)
return;
if (_mapData == null)
@ -43,6 +44,7 @@ public class LoseUI
public void OnReturnClicked()
{
return;
Debug.Log("!!!!!!");
_main.GameLogic.ChangeState(GameState.Finished);
Debug.Log("t1");

View File

@ -14,6 +14,7 @@ public class TimeEndUI
public Button ReturnButton;
public TimeEndUI(Main main, MapData mapData)
{
return;
_main = main;
_mapData = mapData;
ROTimeEndUI = UIManager.Instance.ROUIManager.transform.Find("TimeEndPanel").gameObject;
@ -23,7 +24,7 @@ public class TimeEndUI
}
public void Update()
{
{return;
if (ROTimeEndUI.activeSelf)
return;
if (_mapData == null)
@ -48,7 +49,7 @@ public class TimeEndUI
}
public void OnReturnClicked()
{
{return;
_main.GameLogic.ChangeState(GameState.Menu);
ROTimeEndUI.gameObject.SetActive(false);
UIManager.Instance.GameUI.ShowMainUIManager();

View File

@ -76,6 +76,6 @@ public class TopBarUI
_money.text = Main.MapData.PlayerMap.SelfPlayerData.PlayerWealth +
" <color=yellow>+ " + Main.PlayerLogic.GetPlayerStarsPerTurn(Main.MapData, Main.MapData.PlayerMap.SelfPlayerData.Id) + "</color>";
_faith.text = Main.MapData.PlayerMap.SelfPlayerData.PlayerScore.ToString();
_turn.text = Main.MapData.PlayerMap.SelfPlayerData.Turn + "/30";
_turn.text = Main.MapData.PlayerMap.SelfPlayerData.Turn.ToString();// + "/30";
}
}

View File

@ -5,35 +5,77 @@ using Logic;
using RuntimeData;
using UnityEngine.UI;
using System.Collections.Generic;
using Logic.Multilingual;
using ParadoxNotion.Design;
using TH1Resource;
public class WinUI
{
private Main _main;
private MapData _mapData;
public GameObject ROWinUI;
public Button ReturnButton;
private GameObject _ROWinUI;
private Button _returnButton;
private Image _frontBG;
public WinUI(Main main, MapData mapData)
{
_main = main;
_mapData = mapData;
ROWinUI = UIManager.Instance.ROUIManager.transform.Find("WinPanel").gameObject;
ROWinUI.gameObject.SetActive(false);
ReturnButton = ROWinUI.transform.Find("MsgList/Row4/Button").GetComponent<Button>(); // ← 新增按钮
ReturnButton.onClick.AddListener(OnReturnClicked); // ← 新增点击监听
_ROWinUI = UIManager.Instance.ROUIManager.transform.Find("WinPanel").gameObject;
_ROWinUI.gameObject.SetActive(false);
_returnButton = _ROWinUI.transform.Find("MsgList/Row4/Button").GetComponent<Button>(); // ← 新增按钮
_returnButton.onClick.AddListener(OnReturnClicked); // ← 新增点击监听
_frontBG = _ROWinUI.transform.Find("BGFront")?.GetComponent<Image>();
}
public void Show()
{
_ROWinUI.gameObject.SetActive(true);
var anim = _ROWinUI.GetComponent<AnimancerComponent>();
if (anim != null)
anim.Play(ResourceCache.Instance.AnimCache.UICommonPanelFadeIn);
}
public void Update()
{
if (ROWinUI.activeSelf)
if (_ROWinUI.activeSelf)
return;
if (_mapData == null)
return;
if (_mapData.PlayerMap.CheckSelfWin())
{
ROWinUI.transform.Find("MsgList/Row1/Head1/Text").GetComponent<TextMeshProUGUI>().text = _mapData.GetCityCount(_mapData.PlayerMap.SelfPlayerData.Id).ToString();
ROWinUI.transform.Find("MsgList/Row2/Head1/Text").GetComponent<TextMeshProUGUI>().text = "0";
ROWinUI.transform.Find("MsgList/Row3/Head1/Text").GetComponent<TextMeshProUGUI>().text = _mapData.PlayerMap.SelfPlayerData.PlayerScore.ToString();
ROWinUI.gameObject.SetActive(true);
var tt = _ROWinUI.transform.Find("Title")?.GetComponent<TextMeshProUGUI>();
if (tt != null)
tt.text = "Victory!!!";
/*
MultilingualManager.Instance.SetUIText(_ROWinUI.transform.Find("Title")?.GetComponent<TextMeshProUGUI>(),
Table.Instance.TextDataAssets.WinUIWinText);*/
_ROWinUI.transform.Find("flowerDeco").gameObject.SetActive(true);
if(_frontBG != null)
_frontBG.color = Color.white;
_ROWinUI.transform.Find("MsgList/Row1/Value").GetComponent<TextMeshProUGUI>().text = _mapData.GetCityCount(_mapData.PlayerMap.SelfPlayerData.Id).ToString();
_ROWinUI.transform.Find("MsgList/Row2/Value").GetComponent<TextMeshProUGUI>().text = _mapData.GetCityCount(_mapData.PlayerMap.SelfPlayerData.Turn).ToString();
_ROWinUI.transform.Find("MsgList/Row3/Value").GetComponent<TextMeshProUGUI>().text = _mapData.PlayerMap.SelfPlayerData.PlayerScore.ToString();
Show();
_main.GameLogic.ChangeState(GameState.Finished);
}
else
if (_mapData.PlayerMap.CheckSelfLose())
{
var tt = _ROWinUI.transform.Find("Title")?.GetComponent<TextMeshProUGUI>();
if (tt != null)
tt.text = "Defeat...";
//TODO 有bug 暂时先用替代方案
/*MultilingualManager.Instance.SetUIText(_ROWinUI.transform.Find("Title")?.GetComponent<TextMeshProUGUI>(),
Table.Instance.TextDataAssets.WinUILoseText);
Debug.Log(Table.Instance.TextDataAssets.WinUILoseText);*/
if(_frontBG != null)
_frontBG.color = new Color(1f,0.5f,0.5f);
_ROWinUI.transform.Find("flowerDeco").gameObject.SetActive(false);
_ROWinUI.transform.Find("MsgList/Row1/Value").GetComponent<TextMeshProUGUI>().text = _mapData.GetCityCount(_mapData.PlayerMap.SelfPlayerData.Id).ToString();
_ROWinUI.transform.Find("MsgList/Row2/Value").GetComponent<TextMeshProUGUI>().text = _mapData.GetCityCount(_mapData.PlayerMap.SelfPlayerData.Turn).ToString();
_ROWinUI.transform.Find("MsgList/Row3/Value").GetComponent<TextMeshProUGUI>().text = _mapData.PlayerMap.SelfPlayerData.PlayerScore.ToString();
Show();
_main.GameLogic.ChangeState(GameState.Finished);
}
// 如果没有正在显示,并且有排队的消息,就开始显示
@ -41,8 +83,18 @@ public class WinUI
public void OnReturnClicked()
{
_main.GameLogic.ChangeState(GameState.Finished);
ROWinUI.gameObject.SetActive(false);
_main.GameLogic.ChangeState(GameState.Menu);
var anim = _ROWinUI.GetComponent<AnimancerComponent>();
if (anim != null)
{
anim.Play(ResourceCache.Instance.AnimCache.UICommonPanelFadeOut);
Timer.Instance.TimerRegister(this, () =>
{
_ROWinUI.gameObject.SetActive(false);
},ResourceCache.Instance.AnimCache.UICommonPanelFadeOut.length);
}
else
_ROWinUI.gameObject.SetActive(false);
UIManager.Instance.GameUI.ShowMainUIManager();
}
}

View File

@ -20,11 +20,11 @@
"url": "https://package.openupm.com"
},
"com.unity.2d.animation": {
"version": "9.0.3",
"version": "9.1.3",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.2d.common": "8.0.1",
"com.unity.2d.common": "8.0.4",
"com.unity.2d.sprite": "1.0.0",
"com.unity.collections": "1.1.0",
"com.unity.modules.animation": "1.0.0",
@ -33,7 +33,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.2d.aseprite": {
"version": "1.0.0",
"version": "1.1.6",
"depth": 1,
"source": "registry",
"dependencies": {
@ -45,15 +45,15 @@
"url": "https://packages.unity.cn"
},
"com.unity.2d.common": {
"version": "8.0.1",
"version": "8.0.4",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.burst": "1.7.3",
"com.unity.2d.sprite": "1.0.0",
"com.unity.mathematics": "1.1.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.burst": "1.7.3"
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://packages.unity.cn"
},
@ -65,12 +65,12 @@
"url": "https://packages.unity.cn"
},
"com.unity.2d.psdimporter": {
"version": "8.0.2",
"version": "8.0.5",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.2d.animation": "9.0.1",
"com.unity.2d.common": "8.0.1",
"com.unity.2d.animation": "9.1.1",
"com.unity.2d.common": "8.0.2",
"com.unity.2d.sprite": "1.0.0"
},
"url": "https://packages.unity.cn"
@ -82,12 +82,12 @@
"dependencies": {}
},
"com.unity.2d.spriteshape": {
"version": "9.0.2",
"version": "9.0.5",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.1.0",
"com.unity.2d.common": "8.0.1",
"com.unity.2d.common": "8.0.4",
"com.unity.modules.physics2d": "1.0.0"
},
"url": "https://packages.unity.cn"
@ -102,23 +102,24 @@
}
},
"com.unity.2d.tilemap.extras": {
"version": "3.1.1",
"version": "3.1.3",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.tilemap": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ugui": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.modules.tilemap": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.cn"
},
"com.unity.burst": {
"version": "1.8.8",
"version": "1.8.18",
"depth": 3,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.2.1"
"com.unity.mathematics": "1.2.1",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.cn"
},
@ -151,14 +152,14 @@
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.2d.animation": "9.0.3",
"com.unity.2d.animation": "9.1.3",
"com.unity.2d.pixel-perfect": "5.0.3",
"com.unity.2d.psdimporter": "8.0.2",
"com.unity.2d.psdimporter": "8.0.5",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "9.0.2",
"com.unity.2d.spriteshape": "9.0.5",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.2d.tilemap.extras": "3.1.1",
"com.unity.2d.aseprite": "1.0.0"
"com.unity.2d.tilemap.extras": "3.1.3",
"com.unity.2d.aseprite": "1.1.6"
}
},
"com.unity.ide.rider": {
@ -187,7 +188,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.scriptablebuildpipeline": {
"version": "1.21.21",
"version": "1.21.25",
"depth": 1,
"source": "registry",
"dependencies": {},

View File

@ -48,6 +48,7 @@ PlayerSettings:
defaultScreenHeightWeb: 600
m_StereoRenderingPath: 0
m_ActiveColorSpace: 1
unsupportedMSAAFallback: 0
m_SpriteBatchVertexThreshold: 300
m_MTRendering: 1
mipStripping: 0
@ -75,6 +76,7 @@ PlayerSettings:
androidMinimumWindowWidth: 400
androidMinimumWindowHeight: 300
androidFullscreenMode: 1
androidAutoRotationBehavior: 1
defaultIsNativeResolution: 0
macRetinaSupport: 1
runInBackground: 0
@ -82,6 +84,7 @@ PlayerSettings:
muteOtherAudioSources: 0
Prepare IOS For Recording: 0
Force IOS Speakers When Recording: 0
audioSpatialExperience: 0
deferSystemGesturesMode: 0
hideHomeButton: 0
submitAnalytics: 1
@ -135,6 +138,8 @@ PlayerSettings:
vulkanEnableLateAcquireNextImage: 0
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 1.0
preloadedAssets: []
metroInputSource: 0
@ -147,6 +152,7 @@ PlayerSettings:
isWsaHolographicRemotingEnabled: 0
enableFrameTimingStats: 0
enableOpenGLProfilerGPURecorders: 1
allowHDRDisplaySupport: 0
useHDRDisplay: 0
hdrBitDepth: 0
m_ColorGamuts: 00000000
@ -228,6 +234,7 @@ PlayerSettings:
iOSMetalForceHardShadows: 0
metalEditorSupport: 1
metalAPIValidation: 1
metalCompileShaderBinary: 0
iOSRenderExtraFrameOnPause: 0
iosCopyPluginsCodeInsteadOfSymlink: 0
appleDeveloperTeamID:
@ -448,7 +455,7 @@ PlayerSettings:
switchSocketConcurrencyLimit: 14
switchScreenResolutionBehavior: 2
switchUseCPUProfiler: 0
switchUseGOLDLinker: 0
switchEnableFileSystemTrace: 0
switchLTOSetting: 0
switchApplicationID: 0x01004b9000490000
switchNSODependencies:
@ -578,7 +585,6 @@ PlayerSettings:
switchSocketBufferEfficiency: 4
switchSocketInitializeEnabled: 1
switchNetworkInterfaceManagerInitializeEnabled: 1
switchPlayerConnectionEnabled: 1
switchUseNewStyleFilepaths: 0
switchUseLegacyFmodPriorities: 0
switchUseMicroSleepForYield: 1
@ -743,6 +749,7 @@ PlayerSettings:
metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0}
metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1}
metroSplashScreenUseBackgroundColor: 0
syncCapabilities: 0
platformCapabilities: {}
metroTargetDeviceFamilies: {}
metroFTAName:

View File

@ -1,2 +1,2 @@
m_EditorVersion: 2022.3.8f1c1
m_EditorVersionWithRevision: 2022.3.8f1c1 (4ec8ee1b2212)
m_EditorVersion: 2022.3.53f1c1
m_EditorVersionWithRevision: 2022.3.53f1c1 (f16e16b78e06)