Browse Source

随从技能冷却

pull/40/head
45 1 year ago
parent
commit
dd54a91e84
  1. 16
      ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/PuTong/v01/Card_Ui_ Leixing Fanwei_v01.png.meta
  2. 8
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting.meta
  3. BIN
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/LiTu.png
  4. 127
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/LiTu.png.meta
  5. BIN
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_AnJianKuang_v01.png
  6. 149
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_AnJianKuang_v01.png.meta
  7. BIN
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_BiaoTi_v01.png
  8. 149
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_BiaoTi_v01.png.meta
  9. BIN
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DiBan_v01.png
  10. 149
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DiBan_v01.png.meta
  11. BIN
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGouKuang_v01.png
  12. 149
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGouKuang_v01.png.meta
  13. BIN
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGoui_v01.png
  14. 150
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGoui_v01.png.meta
  15. BIN
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_XuanXiangKuang_v01.png
  16. 149
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_XuanXiangKuang_v01.png.meta
  17. BIN
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_YinLiangAnJian_v01.png
  18. 149
      ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_YinLiangAnJian_v01.png.meta
  19. 8
      ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/Bullet.prefab
  20. 230
      ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v03_OnlyRewardChooseCard.prefab
  21. 12
      ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/CardReward.prefab
  22. 6
      ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ChooseCardPanel.prefab
  23. 8
      ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/MoneyReward.prefab
  24. 92
      ColorlessWorld-2024-4-2/Assets/Prefab/Sevant/ServantSkill/SkillUI.prefab
  25. 482
      ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
  26. 8
      ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs
  27. 9
      ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs
  28. 42
      ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs
  29. 2
      ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ServantSkillNode.cs

16
ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/PuTong/v01/Card_Ui_ Leixing Fanwei_v01.png.meta

@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@ -125,7 +125,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID:
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:

8
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting.meta

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

BIN
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/LiTu.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 664 KiB

127
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/LiTu.png.meta

@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: 2659581f2c0ce4b4f83895faa48737e5
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: 0
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:

BIN
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_AnJianKuang_v01.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

149
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_AnJianKuang_v01.png.meta

@ -0,0 +1,149 @@
fileFormatVersion: 2
guid: de8e54fdb68f4864c80bebb0c8079497
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: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
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:
- serializedVersion: 2
name: Sslx_Ui_SheZhi_AnJianKuang_v01_0
rect:
serializedVersion: 2
x: 83
y: 98
width: 691
height: 158
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 55, y: 18, z: 60, w: 18}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: ea14586c94668bf48bd0b677b9a2546b
internalID: 2137927476
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 7301192ddf1fbdd498147562cff1d14d
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
Sslx_Ui_SheZhi_AnJianKuang_v01_0: 2137927476
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_BiaoTi_v01.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 206 KiB

149
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_BiaoTi_v01.png.meta

@ -0,0 +1,149 @@
fileFormatVersion: 2
guid: 8dd42b56a643d5444987e0f9ee5b5d94
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: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
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:
- serializedVersion: 2
name: Sslx_Ui_SheZhi_BiaoTi_v01_0
rect:
serializedVersion: 2
x: 83
y: 16
width: 805
height: 349
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: a1403bf47d629fb43a943d55ada8042e
internalID: -1094772320
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 0b3bbcc2e41401149b10eecf600bb68a
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
Sslx_Ui_SheZhi_BiaoTi_v01_0: -1094772320
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DiBan_v01.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 133 KiB

149
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DiBan_v01.png.meta

@ -0,0 +1,149 @@
fileFormatVersion: 2
guid: 89d2e111086186d45a91e52bfb95775f
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: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
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:
- serializedVersion: 2
name: Sslx_Ui_SheZhi_DiBan_v01_0
rect:
serializedVersion: 2
x: 196
y: 196
width: 997
height: 1413
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 024005c2dd5d0f44198055262e4866bc
internalID: -395849654
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 8bb4c74d741fd7c4099929ccfe182e1a
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
Sslx_Ui_SheZhi_DiBan_v01_0: -395849654
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGouKuang_v01.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

149
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGouKuang_v01.png.meta

@ -0,0 +1,149 @@
fileFormatVersion: 2
guid: 3763e79e519b4744e8498cf3e15281ab
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: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 1000
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:
- serializedVersion: 2
name: Sslx_Ui_SheZhi_DuiGouKuang_v01_0
rect:
serializedVersion: 2
x: 155
y: 137
width: 370
height: 317
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 52, y: 45, z: 59, w: 52}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 528febffba3f0174f9bb056e2fc61b90
internalID: 1267110475
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5d5e455f91b797447830764bc30b595d
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
Sslx_Ui_SheZhi_DuiGouKuang_v01_0: 1267110475
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGoui_v01.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 223 KiB

150
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_DuiGoui_v01.png.meta

@ -0,0 +1,150 @@
fileFormatVersion: 2
guid: ace3021fc09b4a84991c5535361f7305
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: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
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:
- serializedVersion: 2
name: Sslx_Ui_SheZhi_DuiGoui_v01_0
rect:
serializedVersion: 2
x: 309
y: 190
width: 719
height: 618
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 8c084b171e218ad4b8e9351b817320f2
internalID: 735299134
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 876d5d81d3a53754f8bfa84eaae34ab8
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
Sslx_Ui_SheZhi_DuiGoui_v01_0: 735299134
Sslx_Ui_SheZhi_DuiGoui_v01_1: 2119581007
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_XuanXiangKuang_v01.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

149
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_XuanXiangKuang_v01.png.meta

@ -0,0 +1,149 @@
fileFormatVersion: 2
guid: 2086866033a1171448dc9261291aafa8
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: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
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:
- serializedVersion: 2
name: Sslx_Ui_SheZhi_XuanXiangKuang_v01_0
rect:
serializedVersion: 2
x: 177
y: 167
width: 1418
height: 308
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 61b902b5a4d87c741a434b262e36ef5e
internalID: 1694164675
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: a2bc9f16a6eb7864481f268404f6b713
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
Sslx_Ui_SheZhi_XuanXiangKuang_v01_0: 1694164675
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_YinLiangAnJian_v01.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

149
ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Setting/Sslx_Ui_SheZhi_YinLiangAnJian_v01.png.meta

@ -0,0 +1,149 @@
fileFormatVersion: 2
guid: 08760973ab9c0e444976b3acf82d4b5b
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: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 1000
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:
- serializedVersion: 2
name: Sslx_Ui_SheZhi_YinLiangAnJian_v01_0
rect:
serializedVersion: 2
x: 125
y: 175
width: 213
height: 404
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 49, y: 56, z: 53, w: 66}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: d7385cc81cbeb9644a206e096de74395
internalID: 1870731578
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 32f64e2cb2b18cc478715bf2a5c9a5f9
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
Sslx_Ui_SheZhi_YinLiangAnJian_v01_0: 1870731578
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

8
ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/Bullet.prefab

@ -224,7 +224,7 @@ ParticleSystem:
serializedVersion: 2
minMaxState: 0
minColor: {r: 1, g: 1, b: 1, a: 1}
maxColor: {r: 0.57014847, g: 1, b: 0.21226418, a: 0.42745098}
maxColor: {r: 0.13034001, g: 0.3893672, b: 0.9528302, a: 0.42745098}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
@ -4880,7 +4880,7 @@ MeshRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2996777709463811619}
m_Enabled: 1
m_CastShadows: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
@ -5030,7 +5030,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.5
minScalar: 5
maxCurve:
serializedVersion: 2
@ -5137,7 +5137,7 @@ ParticleSystem:
serializedVersion: 2
minMaxState: 0
minColor: {r: 1, g: 1, b: 1, a: 1}
maxColor: {r: 0.57014847, g: 1, b: 0.21226418, a: 0.42745098}
maxColor: {r: 0, g: 0.19540465, b: 0.8113208, a: 0.42745098}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}

230
ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v03_OnlyRewardChooseCard.prefab

@ -34,8 +34,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.5903, y: -40.819817}
m_SizeDelta: {x: 89.2419, y: 81.6406}
m_AnchoredPosition: {x: 1.3434, y: -48.1811}
m_SizeDelta: {x: 110, y: 94.6501}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8570206769618557703
CanvasRenderer:
@ -105,12 +105,14 @@ RectTransform:
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 7858732250489100000}
- {fileID: 5361034384745054038}
- {fileID: 2056259031377826568}
m_Father: {fileID: 1023735660978789101}
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.8811469, y: 18.575363}
m_AnchoredPosition: {x: -3, y: 18.575363}
m_SizeDelta: {x: 147.36, y: 219.15}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3010471805907384197
@ -141,7 +143,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -767124711, guid: 7af48fcde55284c40b53d553f7083079, type: 3}
m_Sprite: {fileID: -779400533, guid: 3951f3b4e4fa934428664cbbcc23df6a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -185,8 +187,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.00079345703, y: 39.51658}
m_SizeDelta: {x: 100, y: 80.7449}
m_AnchoredPosition: {x: 1.9624, y: 53.8}
m_SizeDelta: {x: 111.2381, y: 85.6419}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8469261094915815852
CanvasRenderer:
@ -216,7 +218,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 182c3c1bcddd9bd4a86cdaaf70e3d6b0, type: 3}
m_Sprite: {fileID: 1398329276, guid: 1b86d79d3a5223e45b16307bd6ed2b92, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -260,7 +262,7 @@ 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.000023841858, y: -11.25}
m_AnchoredPosition: {x: -2.4, y: -6.6}
m_SizeDelta: {x: 20.239, y: 22.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8988904120357358624
@ -305,81 +307,6 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 1
--- !u!1 &1584380816869416965
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1559862289239033703}
- component: {fileID: 2584679090611171910}
- component: {fileID: 8515237810631829489}
m_Layer: 5
m_Name: MidBorder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1559862289239033703
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1584380816869416965}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 1023735660978789101}
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.3478217, y: 16.799988}
m_SizeDelta: {x: 112.5645, y: 34.8011}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2584679090611171910
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1584380816869416965}
m_CullTransparentMesh: 1
--- !u!114 &8515237810631829489
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1584380816869416965}
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: -1367631166, guid: c227a99a29e376f4ebbd02346dc40c6e, 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: 1
--- !u!1 &2745326731275635524
GameObject:
m_ObjectHideFlags: 0
@ -414,8 +341,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.8369, y: -1.8462}
m_SizeDelta: {x: 18.0408, y: 206.3964}
m_AnchoredPosition: {x: 2.8178, y: -0.4513}
m_SizeDelta: {x: 22.0027, y: 213.6089}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2838261514530874316
CanvasRenderer:
@ -445,7 +372,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: -38845363, guid: 1a379197f4a248348889f3c0233f5c99, type: 3}
m_Sprite: {fileID: -1846485671, guid: c531aa26b66654a4caae18840cb08744, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -489,7 +416,7 @@ 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.000015258789, y: 12.259901}
m_AnchoredPosition: {x: -2.3999991, y: 20.1}
m_SizeDelta: {x: 17.977, y: 24.8279}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5144435355750827213
@ -534,6 +461,81 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 3
--- !u!1 &4662204001632911125
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7552119204142249367}
- component: {fileID: 2011782480440086206}
- component: {fileID: 5984446742580670497}
m_Layer: 5
m_Name: BackGround
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7552119204142249367
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4662204001632911125}
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: 1023735660978789101}
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: 1.1811, y: 4.2482}
m_SizeDelta: {x: 209.4314, y: 302.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2011782480440086206
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4662204001632911125}
m_CullTransparentMesh: 1
--- !u!114 &5984446742580670497
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4662204001632911125}
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: -724633554, guid: c861ddefe26cc154e8de878c8bb9a40b, 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: 1
--- !u!1 &5995774149759301209
GameObject:
m_ObjectHideFlags: 0
@ -561,15 +563,15 @@ RectTransform:
m_GameObject: {fileID: 5995774149759301209}
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 6791116358046049278}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 45, y: 45}
m_AnchoredPosition: {x: -0.000048637, y: 0.00007176399}
m_SizeDelta: {x: 56.695, y: 63.391}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7730899574388323005
CanvasRenderer:
@ -592,7 +594,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
@ -601,11 +603,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_MaxSize: 60
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -645,8 +647,6 @@ RectTransform:
m_Children:
- {fileID: 6424003275553431901}
- {fileID: 181647516711415625}
- {fileID: 7858732250489100000}
- {fileID: 5361034384745054038}
m_Father: {fileID: 1023735660978789101}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -727,8 +727,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: -96.91194, y: 139.1}
m_SizeDelta: {x: 30, y: 30}
m_AnchoredPosition: {x: -76.5, y: 139.7}
m_SizeDelta: {x: 28.3474, y: 31.6956}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5775220085188748417
CanvasRenderer:
@ -758,7 +758,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 1928548215, guid: 3942cb915be4d49458ab17ae5bef32b4, type: 3}
m_Sprite: {fileID: 290022622, guid: 16ae439c29f1a134b87db29ac0811e9f, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -798,12 +798,12 @@ RectTransform:
m_GameObject: {fileID: 7164379299506578448}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 8722579538377988857}
- {fileID: 7552119204142249367}
- {fileID: 7930228531046603438}
- {fileID: 1559862289239033703}
- {fileID: 5760218553471671969}
- {fileID: 6791116358046049278}
- {fileID: 6740619428319462914}
@ -835,7 +835,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -1005,7 +1005,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
@ -1143,15 +1143,15 @@ RectTransform:
m_GameObject: {fileID: 7871409229461463633}
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 7930228531046603438}
m_Father: {fileID: 5760218553471671969}
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: 2.9199, y: -55.779}
m_SizeDelta: {x: 89.549, y: 56.809}
m_AnchoredPosition: {x: 2.5464, y: -57.237206}
m_SizeDelta: {x: 173.0744, y: 129.4937}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8697258967315947806
CanvasRenderer:
@ -1183,7 +1183,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 10
m_FontSize: 17
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 1
@ -1222,15 +1222,15 @@ RectTransform:
m_GameObject: {fileID: 8343831271617190617}
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 7930228531046603438}
m_Father: {fileID: 5760218553471671969}
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.00093412, y: -17.750097}
m_SizeDelta: {x: 95.387, y: 19.2492}
m_AnchoredPosition: {x: 2.8, y: -5}
m_SizeDelta: {x: 212.1199, y: 32.6853}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &386391247202283946
CanvasRenderer:
@ -1262,7 +1262,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 15
m_FontSize: 25
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 1

12
ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/CardReward.prefab

@ -36,10 +36,10 @@ RectTransform:
- {fileID: 4123142054426980354}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 235, y: 414}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5082381512918421411
CanvasRenderer:
@ -265,8 +265,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: -94}
m_SizeDelta: {x: 180, y: 160}
m_AnchoredPosition: {x: 0, y: -100}
m_SizeDelta: {x: 210, y: 210}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2733445211847259160
CanvasRenderer:
@ -296,7 +296,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: a8b50b2b4dd2d3b429b213be2a984e0b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

6
ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/ChooseCardPanel.prefab

@ -247,15 +247,15 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 40
m_Left: 115
m_Right: 0
m_Top: 25
m_Top: 41
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 235, y: 414}
m_Spacing: {x: 145, y: 20}
m_Spacing: {x: 70, y: 20}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &5938922564071319870

8
ColorlessWorld-2024-4-2/Assets/Prefab/RewardTip/MoneyReward.prefab

@ -34,8 +34,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: -94}
m_SizeDelta: {x: 180, y: 160}
m_AnchoredPosition: {x: -8, y: -95}
m_SizeDelta: {x: 167.2862, y: 177.0422}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6432755592450523591
CanvasRenderer:
@ -65,7 +65,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 158022059, guid: 702e3230b1367444d9d459f02db67668, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -193,7 +193,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -94}
m_SizeDelta: {x: 180, y: 160}
m_SizeDelta: {x: 235, y: 414}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1534610038301911794
CanvasRenderer:

92
ColorlessWorld-2024-4-2/Assets/Prefab/Sevant/ServantSkill/SkillUI.prefab

@ -75,6 +75,85 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2623737194515270741
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8033696510911491323}
- component: {fileID: 7003721765562612993}
- component: {fileID: 2458353571100227648}
m_Layer: 7
m_Name: CoolDown
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &8033696510911491323
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2623737194515270741}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.005, y: 0.005, z: 0.005}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 6590472616143143499}
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.00000041723, y: -0.00000017136}
m_SizeDelta: {x: 89.983, y: 89.982}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7003721765562612993
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2623737194515270741}
m_CullTransparentMesh: 1
--- !u!114 &2458353571100227648
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2623737194515270741}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 4
--- !u!1 &7216391201375852461
GameObject:
m_ObjectHideFlags: 0
@ -109,6 +188,7 @@ RectTransform:
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 8152314499649109330}
- {fileID: 8033696510911491323}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -239,10 +319,18 @@ MonoBehaviour:
value: 0
throwRange: 0
effectRange: 0
coolDown: 0
useTimes: 0
storageTimes: 0
currentCoolDown: 0
currentUseTimes: 0
currentStorageTimes: 0
skillType: 0
Icon: {fileID: 0}
col: {fileID: 0}
image: {fileID: 0}
coolDownIcon: {fileID: 0}
col: {fileID: 7217144041846661793}
image: {fileID: 5523502723289762611}
button: {fileID: 0}
coolDownText: {fileID: 2458353571100227648}
speed: 25
atlasPath: ServentSkill/Sslx_Ui_SuiCong_JiNeng_v01

482
ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

File diff suppressed because it is too large

8
ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs

@ -201,6 +201,7 @@ public class TurnMaster : Singleton<TurnMaster>
if(skill .currentCoolDown >0)
{
skill.currentCoolDown--;
ServentStateManager.Instance.servant.skillNodeList[skill.effectIndex].coolDownText.text=skill .currentCoolDown .ToString ();
}
if (skill.currentCoolDown <= 0)
@ -210,7 +211,12 @@ public class TurnMaster : Singleton<TurnMaster>
}
}
}
if(skill .currentStorageTimes >0)
{
ServentStateManager.Instance.servant.skillNodeList[skill.effectIndex].GetComponent <Image >().sprite = skill.Icon;
ServentStateManager.Instance.servant.skillNodeList[skill.effectIndex].coolDownText.gameObject.SetActive(false);
}
}
}
//老吊写的函数

9
ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs

@ -39,7 +39,7 @@ public class ServantBottleCat : Servant
}
public void PreEffect_0()
{
MovePreView();
MovePreView();
}
public void PreEffect_1()
{
@ -83,6 +83,8 @@ public class ServantBottleCat : Servant
currentNode.enemyNode.EnemyState.currentHP -= skillList[currentSkillInex].value;
anim.SetTrigger("shoot");
SettleSkillCoolDown(skillList[currentSkillInex], skillNodeList[currentSkillInex]);
}
}
@ -101,9 +103,10 @@ public class ServantBottleCat : Servant
{
node.whoColour = MapUnity.WhoColour.playerColour;
anim.SetTrigger("shoot");
}
anim.SetTrigger("shoot");
SettleSkillCoolDown(skillList[currentSkillInex], skillNodeList[currentSkillInex]);
}
ResetPreView();
}

42
ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs

@ -3,9 +3,9 @@ using System.Collections;
using System.Collections.Generic;
using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.InputSystem;
using UnityEngine.Playables;
using static Servant;
public class Servant : MonoBehaviour
{
@ -81,10 +81,14 @@ public class Servant : MonoBehaviour
{
GameManager.Instance.character = GameManager.SelectedCharacter.servant;
TurnMaster.Instance.servantAction = TurnMaster.ServantAction.useSkill;
//技能范围预览(目前是button触发)
//技能范围预览(button触发添加技能序号)
//MovePreView();
SkillePreviewSelector(currentSkillInex);
ColorInUseSkillUI();
if (skillList[currentSkillInex ].currentStorageTimes > 0)
{
SkillePreviewSelector(currentSkillInex);
ColorInUseSkillUI();
}
}
else if (Physics.Raycast(ray, out RaycastHit raycastHitMap, 500, chooseNodeLayerMask .value))
{
@ -278,6 +282,12 @@ public class Servant : MonoBehaviour
Usermanager.Instance.bleedRealize();
//¼õÌåÁ¦
GameManager.Instance.servantState.currentStepRange -= 1;
//同步技能UI
if (GameManager.Instance.servantState.currentStepRange <= 0)
{
skillList[0].currentStorageTimes = 0;
skillNodeList[0].image.sprite = skillList[0].coolDownIcon;
}
}
this.gameObject.transform.position = new Vector3(mapNode.transform.position.x, 0.5f, mapNode.transform.position.z);
@ -322,9 +332,27 @@ public class Servant : MonoBehaviour
anim.transform.localScale = new Vector3(0.06f, 0.06f, 0.06f);
}
}
public void SettleSkillCoolDown()
//技能冷却结算
public void SettleSkillCoolDown(ServantSkill skill ,ServantSkillNode skillNode)
{
if(skill .currentStorageTimes >0)
{
skill.currentUseTimes--;
if(skill .currentUseTimes <=0)
{
skill.currentStorageTimes--;
skill.currentUseTimes = skill.useTimes;
}
}
if (skill.currentStorageTimes <= 0)
{
skillNode.image .sprite = skill.coolDownIcon;
}
if (skill.currentStorageTimes < skill.storageTimes)
{
skillNode.coolDownText.gameObject.SetActive(true);
skillNode.coolDownText.text = skill.currentCoolDown .ToString ();
}
}

2
ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ServantSkillNode.cs

@ -12,7 +12,7 @@ public class ServantSkillNode : MonoBehaviour
public Collider col;
public Image image;
public Button button;
public Text coolDownText;
public float speed;
public string atlasPath;

Loading…
Cancel
Save