修复科技树bug
This commit is contained in:
daixiawu
parent
fc5f097200
commit
5d5c70ef21
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7610464687553b94a815c5252c02529e
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Unity/Assets/Resources/ArtResources/TH1ProjectSetting/UI_04.png
Normal file
BIN
Unity/Assets/Resources/ArtResources/TH1ProjectSetting/UI_04.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 63 KiB |
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 140ff625225464f4ea99babb79a5a662
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Unity/Assets/Resources/ArtResources/TH1ProjectSetting/icon.ico
Normal file
BIN
Unity/Assets/Resources/ArtResources/TH1ProjectSetting/icon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 76014dabbf7df4d4b98dc8cbbae75ead
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Unity/Assets/Resources/ArtResources/TH1ProjectSetting/icon.png
Normal file
BIN
Unity/Assets/Resources/ArtResources/TH1ProjectSetting/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c2a4d7f9b0efb674e88ab732a570ca42
|
||||
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:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 44 KiB |
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 358afad48673d394b938d1aa799d6fc8
|
||||
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:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 53 KiB |
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d7e01567271607d448edba74314e7616
|
||||
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:
|
||||
@ -8214,4 +8214,10 @@ MonoBehaviour:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
- ID: 1306
|
||||
ZH: "\u5F53\u524D\u7248\u672C[Demo V1.0.1]\r\n\u6B22\u8FCE\u52A0\u5165\u5B98\u65B9Q\u7FA4952618884\r\n\u53CD\u9988\u60A8\u7684\u6E38\u620F\u4F53\u9A8C\u548C\u5EFA\u8BAE\u610F\u89C1~"
|
||||
TDZH:
|
||||
EN:
|
||||
JP:
|
||||
KR:
|
||||
TargetTypes: 0100000001000000010000000100000001000000
|
||||
|
||||
18
Unity/Assets/Resources/Export/VersionConfig.asset
Normal file
18
Unity/Assets/Resources/Export/VersionConfig.asset
Normal file
@ -0,0 +1,18 @@
|
||||
%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: c659b850b20e460f866ed3f696be406b, type: 3}
|
||||
m_Name: VersionConfig
|
||||
m_EditorClassIdentifier:
|
||||
majorVersion: 1
|
||||
minorVersion: 0
|
||||
patchVersion: 0
|
||||
buildNumber: 22
|
||||
8
Unity/Assets/Resources/Export/VersionConfig.asset.meta
Normal file
8
Unity/Assets/Resources/Export/VersionConfig.asset.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d865b37c38d4e354e8bb4f0a931e70ad
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -184,8 +184,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -0.54}
|
||||
m_SizeDelta: {x: 200, y: 50}
|
||||
m_AnchoredPosition: {x: 0.92, y: -0.8}
|
||||
m_SizeDelta: {x: 2.3674, y: 0.8708}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3932256961130037790
|
||||
CanvasRenderer:
|
||||
@ -832,6 +832,215 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &4800135393041783816
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1286491965426141917}
|
||||
- component: {fileID: 8331721925003940818}
|
||||
- component: {fileID: 5648530559652216814}
|
||||
m_Layer: 5
|
||||
m_Name: Name
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1286491965426141917
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4800135393041783816}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1774352506934932859}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -0.7875, y: -0.852}
|
||||
m_SizeDelta: {x: 1.9003, y: 0.8741}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8331721925003940818
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4800135393041783816}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5648530559652216814
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4800135393041783816}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\u6B65\u5175"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
m_sharedMaterial: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 0.8
|
||||
m_fontSizeBase: 0.8
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
m_fontSizeMin: 0.2
|
||||
m_fontSizeMax: 0.8
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: -10
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &4809103369974772668
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4743678665050038577}
|
||||
- component: {fileID: 8506562970266540957}
|
||||
- component: {fileID: 4682654857038033231}
|
||||
m_Layer: 5
|
||||
m_Name: BG
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4743678665050038577
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4809103369974772668}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1774352506934932859}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -0.06225, y: -0.825}
|
||||
m_SizeDelta: {x: 4.1245, y: 1.4611}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8506562970266540957
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4809103369974772668}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &4682654857038033231
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4809103369974772668}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: d7e01567271607d448edba74314e7616, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 100
|
||||
--- !u!1 &5430049394471234066
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2778,7 +2987,9 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 4648123304325160400}
|
||||
- {fileID: 4743678665050038577}
|
||||
- {fileID: 4374246501840551222}
|
||||
- {fileID: 1286491965426141917}
|
||||
- {fileID: 7937721310330358226}
|
||||
- {fileID: 8077308291373221807}
|
||||
m_Father: {fileID: 5169141587389585031}
|
||||
|
||||
@ -10920,6 +10920,7 @@ GameObject:
|
||||
- component: {fileID: 101555106}
|
||||
- component: {fileID: 101555109}
|
||||
- component: {fileID: 101555110}
|
||||
- component: {fileID: 101555111}
|
||||
m_Layer: 5
|
||||
m_Name: Item1
|
||||
m_TagString: Untagged
|
||||
@ -11069,6 +11070,18 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 309f3ee9008b7c94e90d09b29d0f17ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &101555111
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 101555103}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5547c34cc1bfb0f42b3edb35f70b045c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &102762000
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -58769,6 +58782,7 @@ GameObject:
|
||||
- component: {fileID: 498832532}
|
||||
- component: {fileID: 498832535}
|
||||
- component: {fileID: 498832536}
|
||||
- component: {fileID: 498832537}
|
||||
m_Layer: 5
|
||||
m_Name: Item3
|
||||
m_TagString: Untagged
|
||||
@ -58918,6 +58932,18 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 309f3ee9008b7c94e90d09b29d0f17ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &498832537
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 498832529}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5547c34cc1bfb0f42b3edb35f70b045c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &498991479
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -69741,7 +69767,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 29
|
||||
ID: 1264
|
||||
FontID: 1
|
||||
TextCfg:
|
||||
- Type: 0
|
||||
@ -87884,7 +87910,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 33
|
||||
ID: 496
|
||||
FontID: 1
|
||||
TextCfg:
|
||||
- Type: 0
|
||||
@ -149392,7 +149418,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\u5F53\u524D\u7248\u672C[Demo V1.0]\n\u6B22\u8FCE\u52A0\u5165\u5B98\u65B9Q\u7FA4952618884\n\u53CD\u9988\u60A8\u7684\u6E38\u620F\u4F53\u9A8C\u548C\u5EFA\u8BAE\u610F\u89C1~"
|
||||
m_text: "\u5F53\u524D\u7248\u672C[Demo V1.0.1]\n\u6B22\u8FCE\u52A0\u5165\u5B98\u65B9Q\u7FA4952618884\n\u53CD\u9988\u60A8\u7684\u6E38\u620F\u4F53\u9A8C\u548C\u5EFA\u8BAE\u610F\u89C1~"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
m_sharedMaterial: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
@ -149482,7 +149508,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 1273
|
||||
ID: 1306
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
--- !u!1 &1173852212
|
||||
@ -185565,6 +185591,7 @@ GameObject:
|
||||
- component: {fileID: 1484731897}
|
||||
- component: {fileID: 1484731900}
|
||||
- component: {fileID: 1484731901}
|
||||
- component: {fileID: 1484731902}
|
||||
m_Layer: 5
|
||||
m_Name: Item2
|
||||
m_TagString: Untagged
|
||||
@ -185714,6 +185741,18 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 309f3ee9008b7c94e90d09b29d0f17ad, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1484731902
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1484731894}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5547c34cc1bfb0f42b3edb35f70b045c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1485114211
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -192342,7 +192381,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 59
|
||||
ID: 1128
|
||||
FontID: 1
|
||||
TextCfg:
|
||||
- Type: 0
|
||||
@ -193906,7 +193945,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
ID: 46
|
||||
ID: 1195
|
||||
FontID: 1
|
||||
TextCfg:
|
||||
- Type: 0
|
||||
@ -193935,7 +193974,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\u5E06\u8239"
|
||||
m_text: "\u514B\u62C9\u514B"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
m_sharedMaterial: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.CompilerServices;
|
||||
using Logic.CrashSight;
|
||||
using Logic.Multilingual;
|
||||
using UnityEngine;
|
||||
using RuntimeData;
|
||||
@ -147,6 +148,11 @@ public class GridAndResourceDataAssets : ScriptableObject
|
||||
{
|
||||
if (!t.HasLevel || gridData == null) return t.Sprite;
|
||||
//如果是拥有level的建筑，还要根据level返回
|
||||
if (gridData.buildingLevel >= t.LevelSprite.Count)
|
||||
{
|
||||
LogSystem.LogError($"gridData BuildingLevel Overflow {gridData.Resource} : {gridData.buildingLevel}");
|
||||
return t.LevelSprite[0];
|
||||
}
|
||||
return t.LevelSprite[gridData.buildingLevel];
|
||||
}
|
||||
|
||||
|
||||
@ -25,12 +25,15 @@ namespace Logic
|
||||
private Vector2Int lastSelectedTile = new Vector2Int(-1, -1); // 上次点击的land坐标
|
||||
private Vector2Int lastSelectedUnit = new Vector2Int(-1, -1); // 上次点击的unit坐标
|
||||
|
||||
//避免打包的时候吧TooltipTrigger代码剥离删掉的临时变量
|
||||
private TooltipTrigger onozukakomachi;
|
||||
bool inputLock = false;
|
||||
|
||||
public InputLogic(Main main, MapData mapData)
|
||||
{
|
||||
_main = main;
|
||||
_mapData = mapData;
|
||||
onozukakomachi = null;
|
||||
}
|
||||
|
||||
private bool ShouldIgnoreClick(GameObject clickedUI)
|
||||
@ -64,10 +67,9 @@ namespace Logic
|
||||
//只要组件有对应的mono数据就可以显示提示
|
||||
private void HintWindowUIHandleHover()
|
||||
{
|
||||
//如果bottominfo没有展开，或者techtree没有展开，或者ChooseUI没有展开 就return
|
||||
//如果bottominfo没有展开，且techtree没有展开 return
|
||||
if (!UIManager.Instance.BottomInfoUI.ROBottomInfoUI.activeSelf
|
||||
&& (!UIManager.Instance.TechTreeUI.ROTechCheckPanel.activeSelf || !UIManager.Instance.TechTreeUI.ROTechTreeUI.activeSelf)
|
||||
&& !UIManager.Instance.GameUI.ChooseUI.ROChooseUI.activeSelf)
|
||||
&& (!UIManager.Instance.TechTreeUI.ROTechCheckPanel.activeSelf || !UIManager.Instance.TechTreeUI.ROTechTreeUI.activeSelf))
|
||||
return;
|
||||
|
||||
PointerEventData pointerData = new PointerEventData(EventSystem.current)
|
||||
|
||||
@ -5,7 +5,9 @@ using RuntimeData;
|
||||
using Logic;
|
||||
using Animancer;
|
||||
using ET.Server;
|
||||
using Logic.Multilingual;
|
||||
using TH1Resource;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace TH1Renderer
|
||||
{
|
||||
@ -20,6 +22,8 @@ namespace TH1Renderer
|
||||
private TextMeshProUGUI _healthText;
|
||||
private GameObject _RODebugText;
|
||||
private TextMeshProUGUI _debugText;
|
||||
private Image _unitInfoBGImg;
|
||||
private TextMeshProUGUI _unitInfoName;
|
||||
|
||||
//------ defense和attack值 显示相关的资源 ------//
|
||||
private Sprite attackSprite;
|
||||
@ -99,6 +103,8 @@ namespace TH1Renderer
|
||||
_spriteRenderer = _ROUnit.transform.Find("UnitSprite").transform.GetComponent<SpriteRenderer>();
|
||||
_healthText = _ROUnit.transform.Find("Canvas").transform.Find("Health").GetComponent<TextMeshProUGUI>();
|
||||
_debugText = _ROUnit.transform.Find("Canvas").transform.Find("DebugText").GetComponent<TextMeshProUGUI>();
|
||||
_unitInfoBGImg = _ROUnit.transform.Find("Canvas/BG")?.GetComponent<Image>();
|
||||
_unitInfoName = _ROUnit.transform.Find("Canvas/Name")?.GetComponent<TextMeshProUGUI>();
|
||||
RenderUpdateUnitAll();
|
||||
|
||||
}
|
||||
@ -331,12 +337,8 @@ namespace TH1Renderer
|
||||
{
|
||||
|
||||
renderVeteran = _unitData.Veteran;
|
||||
_healthText.text = _unitData.Health.ToString();
|
||||
//处理血量的颜色。如果血量<一半且<5，那么赋予红色，否则白色
|
||||
if(_unitData.Health < 5 && _unitData.Health < _unitData.GetMaxHealth() / 2)
|
||||
_healthText.color = Color.red;
|
||||
else
|
||||
_healthText.color = Color.white;
|
||||
RenderUpdateUnitInfo();
|
||||
|
||||
|
||||
//更新图像
|
||||
RenderUpdateUnitSrpite();
|
||||
@ -344,8 +346,7 @@ namespace TH1Renderer
|
||||
RenderUpdateUnitDefense();
|
||||
//更新高亮
|
||||
RenderUpdateUnitGlow();
|
||||
//更新攻击防御的显示
|
||||
//RenderUpdateAtkDfs();
|
||||
|
||||
//初拉单位和selfplayer的视野关系
|
||||
RenderUpdateSelfPlayerSight();
|
||||
//DebugRender
|
||||
@ -355,32 +356,24 @@ namespace TH1Renderer
|
||||
|
||||
}
|
||||
|
||||
public void RenderUpdateAtkDfs()
|
||||
public void RenderUpdateUnitInfo()
|
||||
{
|
||||
_mapData.UnitMap.GetUnitDataByUnitId(_unitId, out var unitData);
|
||||
float attackRaw = unitData.GetAttackValue(_mapData);
|
||||
float defenseRaw = unitData.GetDefenseValue(_mapData);
|
||||
|
||||
//Debug.Log($"[RenderUpdateAtkDfs] Unit {_unitId} | Attack = {attackRaw}");
|
||||
//Debug.Log($"[RenderUpdateAtkDfs] Unit {_unitId} | Defense = {defenseRaw}");
|
||||
|
||||
UpdateAtkGroup(
|
||||
_ROUnit.transform.Find("Canvas/AttackGroup"),
|
||||
attackRaw,
|
||||
attackSprite,
|
||||
attackHalfSprite
|
||||
);
|
||||
|
||||
UpdateDefGroup(
|
||||
_ROUnit.transform.Find("Canvas/DefenseGroup"),
|
||||
defenseRaw,
|
||||
defenseSprite,
|
||||
defenseHalfSprite
|
||||
);
|
||||
_healthText.text = _unitData.Health.ToString();
|
||||
//处理血量的颜色。如果血量<一半且<5，那么赋予红色，否则白色
|
||||
if(_unitData.Health < 5 && _unitData.Health < _unitData.GetMaxHealth() / 2)
|
||||
_healthText.color = Color.red;
|
||||
else
|
||||
_healthText.color = Color.white;
|
||||
//根据敌我情况更新infoBG的颜色
|
||||
_unitInfoBGImg.sprite = (_playerData == _mapData.PlayerMap.SelfPlayerData) ? ResourceCache.Instance.SpriteCache.UnitInfoSelf :
|
||||
ResourceCache.Instance.SpriteCache.UnitInfoEnemy;
|
||||
|
||||
//更改兵种显示文字
|
||||
if(Table.Instance.UnitTypeDataAssets.GetUnitTypeInfo(_unitData.UnitType,_unitData.GiantType,out var info))
|
||||
MultilingualManager.Instance.SetUIText(_unitInfoName,info.Name);
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void UpdateAtkGroup(Transform group, float rawValue, Sprite fullSprite, Sprite halfSprite)
|
||||
{
|
||||
int displayCount = Mathf.CeilToInt(rawValue);
|
||||
@ -532,6 +525,7 @@ namespace TH1Renderer
|
||||
{
|
||||
if (!Table.Instance.UnitTypeDataAssets.GetUnitSpriteGlow(_mapData, _unitData, out sprite))
|
||||
return;
|
||||
|
||||
}
|
||||
//否则不用高亮
|
||||
else
|
||||
@ -541,6 +535,7 @@ namespace TH1Renderer
|
||||
}
|
||||
_spriteRenderer.sprite = sprite;
|
||||
_spriteRenderer.material = ResourceCache.Instance.MatCache.TH1URPShaders_Default;
|
||||
_unitInfoBGImg.material = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -17,7 +17,9 @@ namespace TH1Resource
|
||||
public Sprite WaterSprite;
|
||||
public Sprite OceanSprite;
|
||||
public Dictionary<string, Sprite> Roads = new();
|
||||
|
||||
public Sprite UnitInfoSelf;
|
||||
public Sprite UnitInfoEnemy;
|
||||
|
||||
|
||||
//-------UI相关--------
|
||||
public Sprite TechCompleteBackground;
|
||||
@ -35,7 +37,10 @@ namespace TH1Resource
|
||||
Roads["WaterRoad"+i] = Resources.Load<Sprite>($"ArtResources/TH1Miscs/TH1Misc_WaterRoad{i}");
|
||||
|
||||
}
|
||||
|
||||
UnitInfoSelf = Resources.Load<Sprite>("ArtResources/TH1UI/InGame/UnitInfoSelf");
|
||||
UnitInfoEnemy = Resources.Load<Sprite>("ArtResources/TH1UI/InGame/UnitInfoEnemy");
|
||||
|
||||
|
||||
//--------UI--------
|
||||
TechCompleteBackground = Resources.Load<Sprite>("ArtResources/TH1UI/TechTree/TH1Tech_GreenCircle");
|
||||
TechLockedBackground = Resources.Load<Sprite>("ArtResources/TH1UI/TechTree/TH1Tech_DarkCircle");
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
using UnityEngine;
|
||||
using Logic;
|
||||
using RuntimeData;
|
||||
using TMPro;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class LoseUI
|
||||
{
|
||||
private Main _main;
|
||||
private MapData _mapData;
|
||||
public GameObject ROLoseUI;
|
||||
public Button ReturnButton;
|
||||
|
||||
|
||||
public LoseUI(Main main, MapData mapData)
|
||||
{
|
||||
return;
|
||||
_main = main;
|
||||
_mapData = mapData;
|
||||
ROLoseUI = UIManager.Instance.ROUIManager.transform.Find("LosePanel").gameObject;
|
||||
ROLoseUI.gameObject.SetActive(false);
|
||||
ReturnButton = ROLoseUI.transform.Find("MsgList/Row4/Button").GetComponent<Button>(); // ← 新增按钮获取
|
||||
|
||||
ReturnButton.onClick.AddListener(OnReturnClicked); // ← 新增点击监听
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{return;
|
||||
if (ROLoseUI.activeSelf)
|
||||
return;
|
||||
if (_mapData == null)
|
||||
return;
|
||||
if (_mapData.PlayerMap.CheckSelfLose())
|
||||
{
|
||||
ROLoseUI.gameObject.SetActive(true);
|
||||
ROLoseUI.transform.Find("MsgList/Row1/Head1/Text").GetComponent<TextMeshProUGUI>().text = _mapData.GetCityCount(_mapData.PlayerMap.SelfPlayerData.Id).ToString();
|
||||
ROLoseUI.transform.Find("MsgList/Row2/Head1/Text").GetComponent<TextMeshProUGUI>().text = "0";
|
||||
ROLoseUI.transform.Find("MsgList/Row3/Head1/Text").GetComponent<TextMeshProUGUI>().text = _mapData.PlayerMap.SelfPlayerData.PlayerScore.ToString();
|
||||
}
|
||||
|
||||
// 如果需要处理每帧逻辑，例如动画或显示控制，可在此添加
|
||||
}
|
||||
|
||||
public void OnReturnClicked()
|
||||
{
|
||||
return;
|
||||
Debug.Log("!!!!!!");
|
||||
_main.GameLogic.ChangeState(GameState.Finished);
|
||||
Debug.Log("t1");
|
||||
ROLoseUI.gameObject.SetActive(false);
|
||||
Debug.Log("t2");
|
||||
UIManager.Instance.GameUI.ShowMainUIManager();
|
||||
Debug.Log("t3");
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 843c3b58b63ce8c43bfe77526da539f0
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -284,7 +284,14 @@ PlayerSettings:
|
||||
AndroidMinifyDebug: 0
|
||||
AndroidValidateAppBundleSize: 1
|
||||
AndroidAppBundleSizeToValidate: 150
|
||||
m_BuildTargetIcons: []
|
||||
m_BuildTargetIcons:
|
||||
- m_BuildTarget:
|
||||
m_Icons:
|
||||
- serializedVersion: 2
|
||||
m_Icon: {fileID: 2800000, guid: 140ff625225464f4ea99babb79a5a662, type: 3}
|
||||
m_Width: 128
|
||||
m_Height: 128
|
||||
m_Kind: 0
|
||||
m_BuildTargetPlatformIcons:
|
||||
- m_BuildTarget: Android
|
||||
m_Icons:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user