Merge branch 'main' into TT

# Conflicts:
#	Blacksmith/Assets/Scenes/SampleScene.unity
#	Blacksmith/Assets/Script/Battle/BattleManager.cs
#	Blacksmith/Assets/Script/GameSystem.cs
#	Blacksmith/Assets/Script/UI/ForgePanel.cs
#	Blacksmith/MiniTemplate/Datas/常量表.xlsx
#	Blacksmith/UserSettings/Layouts/default-2022.dwlt
#	box1/UserSettings/Layouts/default-2022.dwlt
This commit is contained in:
DESKTOP-DDTRVOR\asus 2024-12-25 16:35:48 +08:00
commit 5109d909d6
77 changed files with 10599 additions and 2369 deletions

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: f8ce3fb1c628dc549a32a253b410c3ca
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
- serializedVersion: 3
buildTarget: iPhone
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: WebGL
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: Android
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: 82 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 6bdbc2cabf58d03459ac8cd128d9ad99
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
- serializedVersion: 3
buildTarget: iPhone
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: WebGL
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: Android
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: 65 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: eda84e15597e8bd4aba6f800948d6bb3
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
- serializedVersion: 3
buildTarget: iPhone
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: WebGL
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: Android
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: 10 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 8607e967311a7c14caaca1635cccc45e
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
- serializedVersion: 3
buildTarget: iPhone
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: WebGL
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: Android
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:

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: ce872fa9eb6ce654a806ef117a11c73d
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
- serializedVersion: 3
buildTarget: iPhone
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: WebGL
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: Android
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: 4.8 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: f89221d90a8f1814e87f6818c5ea99bb
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
- serializedVersion: 3
buildTarget: iPhone
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: WebGL
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: Android
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: 62 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 3f01830ec24a87f419cf51606a447c89
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
- serializedVersion: 3
buildTarget: iPhone
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: WebGL
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: Android
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: 46 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 5d72277cd0f29d843b0aa72c209011c5
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
- serializedVersion: 3
buildTarget: iPhone
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: WebGL
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: Android
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: 1.9 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 252fc8f4c28a7b943ad0ce5a4c231675
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
- serializedVersion: 3
buildTarget: iPhone
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: WebGL
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: Android
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: 13 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 818e5c4dbd2c9524b987fb091f588ab7
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
- serializedVersion: 3
buildTarget: iPhone
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: WebGL
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: Android
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:

View File

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

View File

@ -0,0 +1,7 @@
hand.png
size: 188, 192
filter: Linear, Linear
pma: true
images/hand
bounds: 2, 2, 184, 188
offsets: 0, 0, 185, 188

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 54f2d155d9caa224194d4ad0b3ceaed0
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: 85bd6ecb5b9b0a24aaee814aa0b61bf0
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 0
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: 0
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: 0
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: 0
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: iPhone
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: WebGL
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: Android
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.

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 400efd8d2026e9d4c86d0795f3b6e356
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,19 @@
%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: a6b194f808b1af6499c93410e504af42, type: 3}
m_Name: hand_Atlas
m_EditorClassIdentifier:
textureLoadingMode: 0
onDemandTextureLoader: {fileID: 0}
atlasFile: {fileID: 4900000, guid: 54f2d155d9caa224194d4ad0b3ceaed0, type: 3}
materials:
- {fileID: 2100000, guid: e2ff7ac07ca526a4e9384f68c81d9b34, type: 2}

View File

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

View File

@ -0,0 +1,47 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: hand_Material
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _USE8NEIGHBOURHOOD_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 85bd6ecb5b9b0a24aaee814aa0b61bf0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Cutoff: 0.1
- _OutlineMipLevel: 0
- _OutlineOpaqueAlpha: 1
- _OutlineReferenceTexWidth: 1024
- _OutlineSmoothness: 1
- _OutlineWidth: 3
- _StencilComp: 8
- _StencilRef: 1
- _StraightAlphaInput: 0
- _ThresholdEnd: 0.25
- _Use8Neighbourhood: 1
- _UseScreenSpaceOutlineWidth: 0
m_Colors:
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
m_BuildTextureStacks: []

View File

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

View File

@ -0,0 +1,31 @@
%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: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
m_Name: hand_SkeletonData
m_EditorClassIdentifier:
atlasAssets:
- {fileID: 11400000, guid: 6f54e1eab2cfa4649a291b83b4b1a557, type: 2}
scale: 0.01
skeletonJSON: {fileID: 4900000, guid: 400efd8d2026e9d4c86d0795f3b6e356, type: 3}
isUpgradingBlendModeMaterials: 0
blendModeMaterials:
requiresBlendModeMaterials: 0
applyAdditiveMaterial: 1
additiveMaterials: []
multiplyMaterials: []
screenMaterials: []
skeletonDataModifiers: []
fromAnimation: []
toAnimation: []
duration: []
defaultMix: 0.2
controller: {fileID: 0}

View File

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

View File

@ -4,7 +4,7 @@
"Bufftype": 1, "Bufftype": 1,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 1, "Buffeffect1": 1,
"Buffparameter1": 3000, "Buffparameter1": 1000,
"Buffeffect2": 0, "Buffeffect2": 0,
"Buffparameter2": 0, "Buffparameter2": 0,
"Bufftarget": 302011, "Bufftarget": 302011,
@ -18,7 +18,7 @@
"Bufftype": 2, "Bufftype": 2,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 3000, "Buffparameter1": 1000,
"Buffeffect2": 0, "Buffeffect2": 0,
"Buffparameter2": 0, "Buffparameter2": 0,
"Bufftarget": 302011, "Bufftarget": 302011,
@ -29,6 +29,34 @@
}, },
{ {
"ID": 10003, "ID": 10003,
"Bufftype": 1,
"Buffprobability": 10000,
"Buffeffect1": 1,
"Buffparameter1": 2000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302011,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10004,
"Bufftype": 2,
"Buffprobability": 10000,
"Buffeffect1": 2,
"Buffparameter1": 2000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302011,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10005,
"Bufftype": 3, "Bufftype": 3,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 4, "Buffeffect1": 4,
@ -42,10 +70,24 @@
"Buffdisappeartime": 0 "Buffdisappeartime": 0
}, },
{ {
"ID": 10004, "ID": 10006,
"Bufftype": 20, "Bufftype": 3,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 3, "Buffeffect1": 4,
"Buffparameter1": 1500,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302011,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10007,
"Bufftype": 1,
"Buffprobability": 10000,
"Buffeffect1": 1,
"Buffparameter1": 1000, "Buffparameter1": 1000,
"Buffeffect2": 0, "Buffeffect2": 0,
"Buffparameter2": 0, "Buffparameter2": 0,
@ -55,9 +97,37 @@
"Buffdisappear": 0, "Buffdisappear": 0,
"Buffdisappeartime": 0 "Buffdisappeartime": 0
}, },
{
"ID": 10008,
"Bufftype": 2,
"Buffprobability": 10000,
"Buffeffect1": 2,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302011,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10009,
"Bufftype": 3,
"Buffprobability": 10000,
"Buffeffect1": 4,
"Buffparameter1": 2000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302011,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{ {
"ID": 10101, "ID": 10101,
"Bufftype": 4, "Bufftype": 11,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 1, "Buffeffect1": 1,
"Buffparameter1": 3000, "Buffparameter1": 3000,
@ -71,7 +141,7 @@
}, },
{ {
"ID": 10102, "ID": 10102,
"Bufftype": 5, "Bufftype": 12,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 3000, "Buffparameter1": 3000,
@ -85,7 +155,7 @@
}, },
{ {
"ID": 10103, "ID": 10103,
"Bufftype": 6, "Bufftype": 11,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 1, "Buffeffect1": 1,
"Buffparameter1": 3000, "Buffparameter1": 3000,
@ -98,11 +168,109 @@
"Buffdisappeartime": 0 "Buffdisappeartime": 0
}, },
{ {
"ID": 10201, "ID": 10104,
"Bufftype": 7, "Bufftype": 12,
"Buffprobability": 10000,
"Buffeffect1": 2,
"Buffparameter1": 3000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302201,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10105,
"Bufftype": 11,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 1, "Buffeffect1": 1,
"Buffparameter1": 3000, "Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302201,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10106,
"Bufftype": 11,
"Buffprobability": 10000,
"Buffeffect1": 1,
"Buffparameter1": 1500,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302201,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10107,
"Bufftype": 13,
"Buffprobability": 10000,
"Buffeffect1": 3,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302201,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10108,
"Bufftype": 11,
"Buffprobability": 10000,
"Buffeffect1": 1,
"Buffparameter1": 1500,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302201,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10109,
"Bufftype": 13,
"Buffprobability": 10000,
"Buffeffect1": 3,
"Buffparameter1": 500,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302201,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10110,
"Bufftype": 11,
"Buffprobability": 10000,
"Buffeffect1": 1,
"Buffparameter1": 2000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302201,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10201,
"Bufftype": 21,
"Buffprobability": 10000,
"Buffeffect1": 1,
"Buffparameter1": 1000,
"Buffeffect2": 0, "Buffeffect2": 0,
"Buffparameter2": 0, "Buffparameter2": 0,
"Bufftarget": 302301, "Bufftarget": 302301,
@ -113,10 +281,94 @@
}, },
{ {
"ID": 10202, "ID": 10202,
"Bufftype": 8, "Bufftype": 22,
"Buffprobability": 10000,
"Buffeffect1": 2,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302301,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10203,
"Bufftype": 21,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 1, "Buffeffect1": 1,
"Buffparameter1": 3000, "Buffparameter1": 2000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302301,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10204,
"Bufftype": 22,
"Buffprobability": 10000,
"Buffeffect1": 2,
"Buffparameter1": 2000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302301,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10206,
"Bufftype": 23,
"Buffprobability": 10000,
"Buffeffect1": 3,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302301,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10207,
"Bufftype": 21,
"Buffprobability": 10000,
"Buffeffect1": 1,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302301,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10208,
"Bufftype": 22,
"Buffprobability": 10000,
"Buffeffect1": 2,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302301,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10209,
"Bufftype": 23,
"Buffprobability": 10000,
"Buffeffect1": 3,
"Buffparameter1": 2000,
"Buffeffect2": 0, "Buffeffect2": 0,
"Buffparameter2": 0, "Buffparameter2": 0,
"Bufftarget": 302301, "Bufftarget": 302301,
@ -127,10 +379,10 @@
}, },
{ {
"ID": 10301, "ID": 10301,
"Bufftype": 9, "Bufftype": 31,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 1, "Buffeffect1": 1,
"Buffparameter1": 3000, "Buffparameter1": 1000,
"Buffeffect2": 0, "Buffeffect2": 0,
"Buffparameter2": 0, "Buffparameter2": 0,
"Bufftarget": 302401, "Bufftarget": 302401,
@ -141,10 +393,94 @@
}, },
{ {
"ID": 10302, "ID": 10302,
"Bufftype": 10, "Bufftype": 32,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 1, "Buffeffect1": 1,
"Buffparameter1": 3000, "Buffparameter1": 2000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302401,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10303,
"Bufftype": 31,
"Buffprobability": 10000,
"Buffeffect1": 2,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302401,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10304,
"Bufftype": 32,
"Buffprobability": 10000,
"Buffeffect1": 1,
"Buffparameter1": 2000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302401,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10305,
"Bufftype": 33,
"Buffprobability": 10000,
"Buffeffect1": 2,
"Buffparameter1": 2000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302401,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10306,
"Bufftype": 31,
"Buffprobability": 10000,
"Buffeffect1": 3,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302401,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10307,
"Bufftype": 32,
"Buffprobability": 10000,
"Buffeffect1": 1,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302401,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10308,
"Bufftype": 33,
"Buffprobability": 10000,
"Buffeffect1": 2,
"Buffparameter1": 2000,
"Buffeffect2": 0, "Buffeffect2": 0,
"Buffparameter2": 0, "Buffparameter2": 0,
"Bufftarget": 302401, "Bufftarget": 302401,
@ -155,13 +491,13 @@
}, },
{ {
"ID": 10401, "ID": 10401,
"Bufftype": 11, "Bufftype": 41,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 1,
"Buffparameter1": 3000, "Buffparameter1": 1000,
"Buffeffect2": 0, "Buffeffect2": 0,
"Buffparameter2": 0, "Buffparameter2": 0,
"Bufftarget": 302501, "Bufftarget": 302401,
"BuffSpecial": 0, "BuffSpecial": 0,
"Bufftake": 100, "Bufftake": 100,
"Buffdisappear": 0, "Buffdisappear": 0,
@ -169,41 +505,83 @@
}, },
{ {
"ID": 10402, "ID": 10402,
"Bufftype": 12, "Bufftype": 42,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 3000, "Buffparameter1": 2000,
"Buffeffect2": 0, "Buffeffect2": 0,
"Buffparameter2": 0, "Buffparameter2": 0,
"Bufftarget": 302501, "Bufftarget": 302401,
"BuffSpecial": 0, "BuffSpecial": 0,
"Bufftake": 100, "Bufftake": 100,
"Buffdisappear": 0, "Buffdisappear": 0,
"Buffdisappeartime": 0 "Buffdisappeartime": 0
}, },
{ {
"ID": 10410, "ID": 10403,
"Bufftype": 13, "Bufftype": 41,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 9, "Buffeffect1": 1,
"Buffparameter1": 1, "Buffparameter1": 1000,
"Buffeffect2": 0, "Buffeffect2": 0,
"Buffparameter2": 0, "Buffparameter2": 0,
"Bufftarget": 302501, "Bufftarget": 302401,
"BuffSpecial": 0, "BuffSpecial": 0,
"Bufftake": 100, "Bufftake": 100,
"Buffdisappear": 0, "Buffdisappear": 0,
"Buffdisappeartime": 0 "Buffdisappeartime": 0
}, },
{ {
"ID": 10411, "ID": 10404,
"Bufftype": 13, "Bufftype": 42,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 9, "Buffeffect1": 2,
"Buffparameter1": 2, "Buffparameter1": 2000,
"Buffeffect2": 0, "Buffeffect2": 0,
"Buffparameter2": 0, "Buffparameter2": 0,
"Bufftarget": 302501, "Bufftarget": 302401,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10405,
"Bufftype": 41,
"Buffprobability": 10000,
"Buffeffect1": 1,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302401,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10406,
"Bufftype": 42,
"Buffprobability": 10000,
"Buffeffect1": 2,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302401,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10407,
"Bufftype": 43,
"Buffprobability": 10000,
"Buffeffect1": 3,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302401,
"BuffSpecial": 0, "BuffSpecial": 0,
"Bufftake": 100, "Bufftake": 100,
"Buffdisappear": 0, "Buffdisappear": 0,
@ -211,9 +589,51 @@
}, },
{ {
"ID": 10501, "ID": 10501,
"Bufftype": 13, "Bufftype": 52,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 1, "Buffeffect1": 2,
"Buffparameter1": 1500,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302101,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10502,
"Bufftype": 52,
"Buffprobability": 10000,
"Buffeffect1": 2,
"Buffparameter1": 2000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302101,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10503,
"Bufftype": 58,
"Buffprobability": 10000,
"Buffeffect1": 8,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302101,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10504,
"Bufftype": 52,
"Buffprobability": 10000,
"Buffeffect1": 2,
"Buffparameter1": 3000, "Buffparameter1": 3000,
"Buffeffect2": 0, "Buffeffect2": 0,
"Buffparameter2": 0, "Buffparameter2": 0,
@ -225,9 +645,9 @@
}, },
{ {
"ID": 10601, "ID": 10601,
"Bufftype": 14, "Bufftype": 62,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 1, "Buffeffect1": 2,
"Buffparameter1": 3000, "Buffparameter1": 3000,
"Buffeffect2": 0, "Buffeffect2": 0,
"Buffparameter2": 0, "Buffparameter2": 0,
@ -237,9 +657,65 @@
"Buffdisappear": 0, "Buffdisappear": 0,
"Buffdisappeartime": 0 "Buffdisappeartime": 0
}, },
{
"ID": 10602,
"Bufftype": 63,
"Buffprobability": 10000,
"Buffeffect1": 3,
"Buffparameter1": 500,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 1,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10603,
"Bufftype": 62,
"Buffprobability": 10000,
"Buffeffect1": 2,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 302601,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10604,
"Bufftype": 63,
"Buffprobability": 10000,
"Buffeffect1": 3,
"Buffparameter1": 500,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 1,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{
"ID": 10605,
"Bufftype": 63,
"Buffprobability": 10000,
"Buffeffect1": 3,
"Buffparameter1": 1000,
"Buffeffect2": 0,
"Buffparameter2": 0,
"Bufftarget": 1,
"BuffSpecial": 0,
"Bufftake": 100,
"Buffdisappear": 0,
"Buffdisappeartime": 0
},
{ {
"ID": 10701, "ID": 10701,
"Bufftype": 15, "Bufftype": 71,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 1, "Buffeffect1": 1,
"Buffparameter1": 500, "Buffparameter1": 500,
@ -253,7 +729,7 @@
}, },
{ {
"ID": 10702, "ID": 10702,
"Bufftype": 15, "Bufftype": 72,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 1, "Buffeffect1": 1,
"Buffparameter1": 1000, "Buffparameter1": 1000,
@ -267,7 +743,7 @@
}, },
{ {
"ID": 10703, "ID": 10703,
"Bufftype": 15, "Bufftype": 73,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 1, "Buffeffect1": 1,
"Buffparameter1": 2000, "Buffparameter1": 2000,
@ -281,7 +757,7 @@
}, },
{ {
"ID": 10801, "ID": 10801,
"Bufftype": 16, "Bufftype": 81,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 500, "Buffparameter1": 500,
@ -295,7 +771,7 @@
}, },
{ {
"ID": 10802, "ID": 10802,
"Bufftype": 16, "Bufftype": 82,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 1000, "Buffparameter1": 1000,
@ -309,7 +785,7 @@
}, },
{ {
"ID": 10803, "ID": 10803,
"Bufftype": 16, "Bufftype": 83,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 2000, "Buffparameter1": 2000,
@ -323,7 +799,7 @@
}, },
{ {
"ID": 10901, "ID": 10901,
"Bufftype": 17, "Bufftype": 91,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 3, "Buffeffect1": 3,
"Buffparameter1": 500, "Buffparameter1": 500,
@ -337,7 +813,7 @@
}, },
{ {
"ID": 10902, "ID": 10902,
"Bufftype": 17, "Bufftype": 92,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 3, "Buffeffect1": 3,
"Buffparameter1": 1000, "Buffparameter1": 1000,
@ -351,7 +827,7 @@
}, },
{ {
"ID": 10903, "ID": 10903,
"Bufftype": 17, "Bufftype": 93,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 3, "Buffeffect1": 3,
"Buffparameter1": 2000, "Buffparameter1": 2000,
@ -365,7 +841,7 @@
}, },
{ {
"ID": 11001, "ID": 11001,
"Bufftype": 18, "Bufftype": 101,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 8000, "Buffparameter1": 8000,
@ -379,7 +855,7 @@
}, },
{ {
"ID": 11002, "ID": 11002,
"Bufftype": 18, "Bufftype": 102,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 16000, "Buffparameter1": 16000,
@ -393,7 +869,7 @@
}, },
{ {
"ID": 11003, "ID": 11003,
"Bufftype": 18, "Bufftype": 103,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 24000, "Buffparameter1": 24000,
@ -407,7 +883,7 @@
}, },
{ {
"ID": 11004, "ID": 11004,
"Bufftype": 18, "Bufftype": 104,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 36000, "Buffparameter1": 36000,
@ -421,7 +897,7 @@
}, },
{ {
"ID": 11101, "ID": 11101,
"Bufftype": 19, "Bufftype": 105,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 8000, "Buffparameter1": 8000,
@ -435,7 +911,7 @@
}, },
{ {
"ID": 11102, "ID": 11102,
"Bufftype": 19, "Bufftype": 106,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 16000, "Buffparameter1": 16000,
@ -449,7 +925,7 @@
}, },
{ {
"ID": 11103, "ID": 11103,
"Bufftype": 19, "Bufftype": 107,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 24000, "Buffparameter1": 24000,
@ -463,7 +939,7 @@
}, },
{ {
"ID": 11104, "ID": 11104,
"Bufftype": 19, "Bufftype": 108,
"Buffprobability": 10000, "Buffprobability": 10000,
"Buffeffect1": 2, "Buffeffect1": 2,
"Buffparameter1": 36000, "Buffparameter1": 36000,

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -302,13 +302,13 @@
2014 2014
], ],
"Frontend": 0, "Frontend": 0,
"Quality": 3, "Quality": 2,
"Icon": "duanjian", "Icon": "duanjian",
"Addskill": 3020116, "Addskill": 3020130,
"Replace": 0, "Replace": 0,
"Weight": 60, "Weight": 60,
"Title": "剑伤害增加", "Title": "剑伤害增加",
"Describe": "剑增加伤害1" "Describe": "剑类武器攻击+10%"
}, },
{ {
"ID": 90702, "ID": 90702,
@ -319,13 +319,13 @@
2014 2014
], ],
"Frontend": 0, "Frontend": 0,
"Quality": 3, "Quality": 2,
"Icon": "duanjian", "Icon": "duanjian",
"Addskill": 3020121, "Addskill": 3020131,
"Replace": 0, "Replace": 0,
"Weight": 60, "Weight": 60,
"Title": "剑暴击增加", "Title": "剑血量增加",
"Describe": "剑增加暴击1" "Describe": "剑类武器血量+10%"
}, },
{ {
"ID": 90703, "ID": 90703,
@ -336,13 +336,13 @@
2014 2014
], ],
"Frontend": 0, "Frontend": 0,
"Quality": 2, "Quality": 3,
"Icon": "duanjian", "Icon": "duanjian",
"Addskill": 3020126, "Addskill": 3020132,
"Replace": 0, "Replace": 0,
"Weight": 60, "Weight": 30,
"Title": "剑血量增加", "Title": "剑攻击增加",
"Describe": "剑增加血量1" "Describe": "剑类武器攻击+20%"
}, },
{ {
"ID": 90704, "ID": 90704,
@ -353,13 +353,47 @@
2014 2014
], ],
"Frontend": 0, "Frontend": 0,
"Quality": 3,
"Icon": "duanjian",
"Addskill": 3020133,
"Replace": 0,
"Weight": 30,
"Title": "剑血量增加",
"Describe": "剑类武器血量+20%"
},
{
"ID": 90705,
"Carryingprops": [
2011,
2012,
2013,
2014
],
"Frontend": 0,
"Quality": 2, "Quality": 2,
"Icon": "duanjian", "Icon": "duanjian",
"Addskill": 3020119, "Addskill": 3020134,
"Replace": 0, "Replace": 0,
"Weight": 60, "Weight": 30,
"Title": "剑攻速增加", "Title": "剑暴击增加",
"Describe": "剑增加攻击速度1" "Describe": "剑类武器暴击+10%"
},
{
"ID": 90706,
"Carryingprops": [
2011,
2012,
2013,
2014
],
"Frontend": 0,
"Quality": 2,
"Icon": "duanjian",
"Addskill": 3020135,
"Replace": 0,
"Weight": 30,
"Title": "剑暴击增加",
"Describe": "剑类武器暴击+15%"
}, },
{ {
"ID": 90801, "ID": 90801,
@ -372,11 +406,11 @@
"Frontend": 0, "Frontend": 0,
"Quality": 2, "Quality": 2,
"Icon": "tieqiang", "Icon": "tieqiang",
"Addskill": 3022016, "Addskill": 3022030,
"Replace": 0, "Replace": 0,
"Weight": 60, "Weight": 60,
"Title": "长柄伤害增加", "Title": "长柄伤害增加",
"Describe": "长柄伤害增加30%" "Describe": "长柄类武器攻击+10%"
}, },
{ {
"ID": 90802, "ID": 90802,
@ -387,13 +421,98 @@
2204 2204
], ],
"Frontend": 0, "Frontend": 0,
"Quality": 1, "Quality": 2,
"Icon": "tieqiang", "Icon": "tieqiang",
"Addskill": 3022017, "Addskill": 3022031,
"Replace": 0, "Replace": 0,
"Weight": 60, "Weight": 60,
"Title": "长柄生命增加", "Title": "长柄生命增加",
"Describe": "长柄生命上限增加30%" "Describe": "长柄类武器血量+10%"
},
{
"ID": 90803,
"Carryingprops": [
2201,
2202,
2203,
2204
],
"Frontend": 0,
"Quality": 3,
"Icon": "tieqiang",
"Addskill": 3022032,
"Replace": 0,
"Weight": 60,
"Title": "长柄伤害增加",
"Describe": "长柄类武器攻击+20%"
},
{
"ID": 90804,
"Carryingprops": [
2201,
2202,
2203,
2204
],
"Frontend": 0,
"Quality": 3,
"Icon": "tieqiang",
"Addskill": 3022033,
"Replace": 0,
"Weight": 60,
"Title": "长柄血量增加",
"Describe": "长柄类武器血量+20%"
},
{
"ID": 90805,
"Carryingprops": [
2201,
2202,
2203,
2204
],
"Frontend": 0,
"Quality": 2,
"Icon": "tieqiang",
"Addskill": 3022034,
"Replace": 0,
"Weight": 60,
"Title": "长柄暴击增加",
"Describe": "长柄类武器暴击+10%"
},
{
"ID": 90806,
"Carryingprops": [
2201,
2202,
2203,
2204
],
"Frontend": 0,
"Quality": 1,
"Icon": "tieqiang",
"Addskill": 3022035,
"Replace": 0,
"Weight": 60,
"Title": "长柄暴击增加",
"Describe": "长柄类武器暴击+15%"
},
{
"ID": 90807,
"Carryingprops": [
2201,
2202,
2203,
2204
],
"Frontend": 0,
"Quality": 2,
"Icon": "tieqiang",
"Addskill": 3022036,
"Replace": 0,
"Weight": 60,
"Title": "长柄攻速增加",
"Describe": "长柄类武器攻速+10%"
}, },
{ {
"ID": 90901, "ID": 90901,
@ -406,11 +525,11 @@
"Frontend": 0, "Frontend": 0,
"Quality": 2, "Quality": 2,
"Icon": "mufazhang", "Icon": "mufazhang",
"Addskill": 3023016, "Addskill": 3023030,
"Replace": 0, "Replace": 0,
"Weight": 60, "Weight": 60,
"Title": "杖伤害增加", "Title": "杖伤害增加",
"Describe": "仗伤害增加30%" "Describe": "杖类武器攻击+10%"
}, },
{ {
"ID": 90902, "ID": 90902,
@ -421,13 +540,64 @@
2304 2304
], ],
"Frontend": 0, "Frontend": 0,
"Quality": 1, "Quality": 2,
"Icon": "mufazhang", "Icon": "mufazhang",
"Addskill": 3023017, "Addskill": 3023031,
"Replace": 0, "Replace": 0,
"Weight": 60, "Weight": 60,
"Title": "杖生命增加", "Title": "杖生命增加",
"Describe": "仗生命上限增加30%" "Describe": "杖类武器血量+10%"
},
{
"ID": 90903,
"Carryingprops": [
2301,
2302,
2303,
2304
],
"Frontend": 0,
"Quality": 3,
"Icon": "mufazhang",
"Addskill": 3023032,
"Replace": 0,
"Weight": 60,
"Title": "杖伤害增加",
"Describe": "杖类武器攻击+20%"
},
{
"ID": 90904,
"Carryingprops": [
2301,
2302,
2303,
2304
],
"Frontend": 0,
"Quality": 3,
"Icon": "mufazhang",
"Addskill": 3023033,
"Replace": 0,
"Weight": 60,
"Title": "杖生命增加",
"Describe": "杖类武器血量+20%"
},
{
"ID": 90905,
"Carryingprops": [
2301,
2302,
2303,
2304
],
"Frontend": 0,
"Quality": 2,
"Icon": "mufazhang",
"Addskill": 3023034,
"Replace": 0,
"Weight": 60,
"Title": "杖攻速增加",
"Describe": "杖类武器攻速+10%"
}, },
{ {
"ID": 91001, "ID": 91001,
@ -440,11 +610,11 @@
"Frontend": 0, "Frontend": 0,
"Quality": 2, "Quality": 2,
"Icon": "mugong", "Icon": "mugong",
"Addskill": 3024016, "Addskill": 3024030,
"Replace": 0, "Replace": 0,
"Weight": 60, "Weight": 60,
"Title": "弓箭伤害增加", "Title": "弓箭伤害增加",
"Describe": "弓箭伤害增加30%" "Describe": "弓箭类武器攻击+10%"
}, },
{ {
"ID": 91002, "ID": 91002,
@ -455,13 +625,64 @@
2404 2404
], ],
"Frontend": 0, "Frontend": 0,
"Quality": 1, "Quality": 2,
"Icon": "mugong", "Icon": "mugong",
"Addskill": 3024017, "Addskill": 3024031,
"Replace": 0, "Replace": 0,
"Weight": 60, "Weight": 60,
"Title": "弓箭生命增加", "Title": "弓箭生命增加",
"Describe": "弓箭生命上限增加30%" "Describe": "弓箭类武器血量+10%"
},
{
"ID": 91003,
"Carryingprops": [
2401,
2402,
2403,
2404
],
"Frontend": 0,
"Quality": 3,
"Icon": "mugong",
"Addskill": 3024032,
"Replace": 0,
"Weight": 60,
"Title": "弓箭伤害增加",
"Describe": "弓箭类武器攻击+20%"
},
{
"ID": 91004,
"Carryingprops": [
2401,
2402,
2403,
2404
],
"Frontend": 0,
"Quality": 3,
"Icon": "mugong",
"Addskill": 3024033,
"Replace": 0,
"Weight": 60,
"Title": "弓箭生命增加",
"Describe": "弓箭类武器血量+20%"
},
{
"ID": 91005,
"Carryingprops": [
2401,
2402,
2403,
2404
],
"Frontend": 0,
"Quality": 2,
"Icon": "mugong",
"Addskill": 3024034,
"Replace": 0,
"Weight": 60,
"Title": "弓箭攻速增加",
"Describe": "弓箭类武器攻速+10%"
}, },
{ {
"ID": 91101, "ID": 91101,
@ -474,11 +695,11 @@
"Frontend": 0, "Frontend": 0,
"Quality": 2, "Quality": 2,
"Icon": "feibiao", "Icon": "feibiao",
"Addskill": 3025016, "Addskill": 3025030,
"Replace": 0, "Replace": 0,
"Weight": 60, "Weight": 60,
"Title": "手里剑伤害增加", "Title": "手里剑伤害增加",
"Describe": "手里剑伤害增加30%" "Describe": "飞镖类武器攻击+10%"
}, },
{ {
"ID": 91102, "ID": 91102,
@ -489,13 +710,13 @@
2504 2504
], ],
"Frontend": 0, "Frontend": 0,
"Quality": 1, "Quality": 2,
"Icon": "feibiao", "Icon": "feibiao",
"Addskill": 3025017, "Addskill": 3025031,
"Replace": 0, "Replace": 0,
"Weight": 60, "Weight": 60,
"Title": "手里剑生命增加", "Title": "手里剑生命增加",
"Describe": "手里剑生命上限增加30%" "Describe": "飞镖类武器血量+10%"
}, },
{ {
"ID": 91103, "ID": 91103,
@ -506,13 +727,13 @@
2504 2504
], ],
"Frontend": 0, "Frontend": 0,
"Quality": 2, "Quality": 3,
"Icon": "feibiao", "Icon": "feibiao",
"Addskill": 3025018, "Addskill": 3025032,
"Replace": 0, "Replace": 0,
"Weight": 60, "Weight": 60,
"Title": "穿透", "Title": "手里剑伤害增加",
"Describe": "手里剑箭穿透1" "Describe": "飞镖类武器攻击+20%"
}, },
{ {
"ID": 91104, "ID": 91104,
@ -522,14 +743,14 @@
2503, 2503,
2504 2504
], ],
"Frontend": 3025018, "Frontend": 0,
"Quality": 3, "Quality": 3,
"Icon": "feibiao", "Icon": "feibiao",
"Addskill": 0, "Addskill": 3025033,
"Replace": 3025019, "Replace": 0,
"Weight": 60, "Weight": 60,
"Title": "穿透", "Title": "手里剑生命增加",
"Describe": "手里剑箭穿透2" "Describe": "飞镖类武器血量+20%"
}, },
{ {
"ID": 91201, "ID": 91201,
@ -541,7 +762,7 @@
"Icon": "duanjian", "Icon": "duanjian",
"Addskill": 3020111, "Addskill": 3020111,
"Replace": 0, "Replace": 0,
"Weight": 50, "Weight": 100,
"Title": "获得", "Title": "获得",
"Describe": "获得一个剑" "Describe": "获得一个剑"
}, },
@ -555,7 +776,7 @@
"Icon": "duanjian", "Icon": "duanjian",
"Addskill": 3021011, "Addskill": 3021011,
"Replace": 0, "Replace": 0,
"Weight": 50, "Weight": 100,
"Title": "获得", "Title": "获得",
"Describe": "获得一个重甲" "Describe": "获得一个重甲"
}, },
@ -569,7 +790,7 @@
"Icon": "duanjian", "Icon": "duanjian",
"Addskill": 3022011, "Addskill": 3022011,
"Replace": 0, "Replace": 0,
"Weight": 50, "Weight": 100,
"Title": "获得", "Title": "获得",
"Describe": "获得一个长柄" "Describe": "获得一个长柄"
}, },
@ -583,7 +804,7 @@
"Icon": "duanjian", "Icon": "duanjian",
"Addskill": 3023011, "Addskill": 3023011,
"Replace": 0, "Replace": 0,
"Weight": 50, "Weight": 100,
"Title": "获得", "Title": "获得",
"Describe": "获得一个杖" "Describe": "获得一个杖"
}, },
@ -597,7 +818,7 @@
"Icon": "duanjian", "Icon": "duanjian",
"Addskill": 3024011, "Addskill": 3024011,
"Replace": 0, "Replace": 0,
"Weight": 50, "Weight": 100,
"Title": "获得", "Title": "获得",
"Describe": "获得一个弓箭" "Describe": "获得一个弓箭"
}, },
@ -611,7 +832,7 @@
"Icon": "duanjian", "Icon": "duanjian",
"Addskill": 3025011, "Addskill": 3025011,
"Replace": 0, "Replace": 0,
"Weight": 50, "Weight": 100,
"Title": "获得", "Title": "获得",
"Describe": "获得一个轻甲" "Describe": "获得一个轻甲"
}, },
@ -625,7 +846,7 @@
"Icon": "duanjian", "Icon": "duanjian",
"Addskill": 3026011, "Addskill": 3026011,
"Replace": 0, "Replace": 0,
"Weight": 50, "Weight": 100,
"Title": "获得", "Title": "获得",
"Describe": "获得一个手里剑" "Describe": "获得一个手里剑"
} }

View File

@ -1,7 +1,7 @@
[ [
{ {
"SkillbodyID": 60400111, "SkillbodyID": 60400111,
"Skillbodyicon": "shitou", "Skillbodyicon": "huoqiu",
"Skillbodyeffect": "", "Skillbodyeffect": "",
"Skillbodytime": 100, "Skillbodytime": 100,
"Skillbody": 0, "Skillbody": 0,
@ -9,7 +9,7 @@
}, },
{ {
"SkillbodyID": 60800111, "SkillbodyID": 60800111,
"Skillbodyicon": "shitou", "Skillbodyicon": "huoqiu",
"Skillbodyeffect": "", "Skillbodyeffect": "",
"Skillbodytime": 100, "Skillbodytime": 100,
"Skillbody": 0, "Skillbody": 0,
@ -17,7 +17,7 @@
}, },
{ {
"SkillbodyID": 60900111, "SkillbodyID": 60900111,
"Skillbodyicon": "shitou", "Skillbodyicon": "huoqiu",
"Skillbodyeffect": "", "Skillbodyeffect": "",
"Skillbodytime": 100, "Skillbodytime": 100,
"Skillbody": 0, "Skillbody": 0,
@ -25,7 +25,7 @@
}, },
{ {
"SkillbodyID": 61300111, "SkillbodyID": 61300111,
"Skillbodyicon": "shitou", "Skillbodyicon": "huoqiu",
"Skillbodyeffect": "", "Skillbodyeffect": "",
"Skillbodytime": 100, "Skillbodytime": 100,
"Skillbody": 0, "Skillbody": 0,
@ -33,7 +33,7 @@
}, },
{ {
"SkillbodyID": 61700111, "SkillbodyID": 61700111,
"Skillbodyicon": "shitou", "Skillbodyicon": "huoqiu",
"Skillbodyeffect": "", "Skillbodyeffect": "",
"Skillbodytime": 100, "Skillbodytime": 100,
"Skillbody": 0, "Skillbody": 0,
@ -41,7 +41,7 @@
}, },
{ {
"SkillbodyID": 62000111, "SkillbodyID": 62000111,
"Skillbodyicon": "shitou", "Skillbodyicon": "huoqiu",
"Skillbodyeffect": "", "Skillbodyeffect": "",
"Skillbodytime": 100, "Skillbodytime": 100,
"Skillbody": 0, "Skillbody": 0,

View File

@ -22,7 +22,7 @@
"Upgradegold": 420, "Upgradegold": 420,
"Attack": 15, "Attack": 15,
"HP": 130, "HP": 130,
"Getskill": 3020116, "Getskill": 3020140,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -74,7 +74,7 @@
"Upgradegold": 1200, "Upgradegold": 1200,
"Attack": 62, "Attack": 62,
"HP": 545, "HP": 545,
"Getskill": 3020116, "Getskill": 3020142,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -126,7 +126,7 @@
"Upgradegold": 1920, "Upgradegold": 1920,
"Attack": 130, "Attack": 130,
"HP": 1135, "HP": 1135,
"Getskill": 3020116, "Getskill": 3020143,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -542,7 +542,7 @@
"Upgradegold": 420, "Upgradegold": 420,
"Attack": 0, "Attack": 0,
"HP": 1590, "HP": 1590,
"Getskill": 0, "Getskill": 3021040,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -594,7 +594,7 @@
"Upgradegold": 1200, "Upgradegold": 1200,
"Attack": 0, "Attack": 0,
"HP": 8115, "HP": 8115,
"Getskill": 0, "Getskill": 3021041,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -646,7 +646,7 @@
"Upgradegold": 1920, "Upgradegold": 1920,
"Attack": 0, "Attack": 0,
"HP": 17420, "HP": 17420,
"Getskill": 0, "Getskill": 3021042,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -1062,7 +1062,7 @@
"Upgradegold": 420, "Upgradegold": 420,
"Attack": 21, "Attack": 21,
"HP": 740, "HP": 740,
"Getskill": 0, "Getskill": 3022040,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -1114,7 +1114,7 @@
"Upgradegold": 1200, "Upgradegold": 1200,
"Attack": 92, "Attack": 92,
"HP": 3705, "HP": 3705,
"Getskill": 0, "Getskill": 3022041,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -1166,7 +1166,7 @@
"Upgradegold": 1920, "Upgradegold": 1920,
"Attack": 193, "Attack": 193,
"HP": 7935, "HP": 7935,
"Getskill": 0, "Getskill": 3022042,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -1582,7 +1582,7 @@
"Upgradegold": 420, "Upgradegold": 420,
"Attack": 12, "Attack": 12,
"HP": 455, "HP": 455,
"Getskill": 0, "Getskill": 3023040,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -1634,7 +1634,7 @@
"Upgradegold": 1200, "Upgradegold": 1200,
"Attack": 47, "Attack": 47,
"HP": 2235, "HP": 2235,
"Getskill": 0, "Getskill": 3023041,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -1686,7 +1686,7 @@
"Upgradegold": 1920, "Upgradegold": 1920,
"Attack": 98, "Attack": 98,
"HP": 4770, "HP": 4770,
"Getskill": 0, "Getskill": 3023042,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -2102,7 +2102,7 @@
"Upgradegold": 420, "Upgradegold": 420,
"Attack": 26, "Attack": 26,
"HP": 455, "HP": 455,
"Getskill": 0, "Getskill": 3021040,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -2154,7 +2154,7 @@
"Upgradegold": 1200, "Upgradegold": 1200,
"Attack": 121, "Attack": 121,
"HP": 2235, "HP": 2235,
"Getskill": 0, "Getskill": 3021041,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -2206,7 +2206,7 @@
"Upgradegold": 1920, "Upgradegold": 1920,
"Attack": 256, "Attack": 256,
"HP": 4770, "HP": 4770,
"Getskill": 0, "Getskill": 3021042,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -2602,7 +2602,7 @@
{ {
"ID": 1302501, "ID": 1302501,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 1, "Level": 1,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 5, "Upgradenumber": 5,
@ -2615,20 +2615,20 @@
{ {
"ID": 1302502, "ID": 1302502,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 2, "Level": 2,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 7, "Upgradenumber": 7,
"Upgradegold": 420, "Upgradegold": 420,
"Attack": 32, "Attack": 32,
"HP": 175, "HP": 175,
"Getskill": 0, "Getskill": 3025040,
"Unlock": 0 "Unlock": 0
}, },
{ {
"ID": 1302503, "ID": 1302503,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 3, "Level": 3,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 11, "Upgradenumber": 11,
@ -2641,7 +2641,7 @@
{ {
"ID": 1302504, "ID": 1302504,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 4, "Level": 4,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 14, "Upgradenumber": 14,
@ -2654,7 +2654,7 @@
{ {
"ID": 1302505, "ID": 1302505,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 5, "Level": 5,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 17, "Upgradenumber": 17,
@ -2667,20 +2667,20 @@
{ {
"ID": 1302506, "ID": 1302506,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 6, "Level": 6,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 20, "Upgradenumber": 20,
"Upgradegold": 1200, "Upgradegold": 1200,
"Attack": 150, "Attack": 150,
"HP": 765, "HP": 765,
"Getskill": 0, "Getskill": 3025041,
"Unlock": 0 "Unlock": 0
}, },
{ {
"ID": 1302507, "ID": 1302507,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 7, "Level": 7,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 23, "Upgradenumber": 23,
@ -2693,7 +2693,7 @@
{ {
"ID": 1302508, "ID": 1302508,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 8, "Level": 8,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 26, "Upgradenumber": 26,
@ -2706,7 +2706,7 @@
{ {
"ID": 1302509, "ID": 1302509,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 9, "Level": 9,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 29, "Upgradenumber": 29,
@ -2719,20 +2719,20 @@
{ {
"ID": 1302510, "ID": 1302510,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 10, "Level": 10,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 32, "Upgradenumber": 32,
"Upgradegold": 1920, "Upgradegold": 1920,
"Attack": 319, "Attack": 319,
"HP": 1610, "HP": 1610,
"Getskill": 0, "Getskill": 3025042,
"Unlock": 0 "Unlock": 0
}, },
{ {
"ID": 1302511, "ID": 1302511,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 11, "Level": 11,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 35, "Upgradenumber": 35,
@ -2745,7 +2745,7 @@
{ {
"ID": 1302512, "ID": 1302512,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 12, "Level": 12,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 38, "Upgradenumber": 38,
@ -2758,7 +2758,7 @@
{ {
"ID": 1302513, "ID": 1302513,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 13, "Level": 13,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 41, "Upgradenumber": 41,
@ -2771,7 +2771,7 @@
{ {
"ID": 1302514, "ID": 1302514,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 14, "Level": 14,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 44, "Upgradenumber": 44,
@ -2784,7 +2784,7 @@
{ {
"ID": 1302515, "ID": 1302515,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 15, "Level": 15,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 47, "Upgradenumber": 47,
@ -2797,7 +2797,7 @@
{ {
"ID": 1302516, "ID": 1302516,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 16, "Level": 16,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 50, "Upgradenumber": 50,
@ -2810,7 +2810,7 @@
{ {
"ID": 1302517, "ID": 1302517,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 17, "Level": 17,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 52, "Upgradenumber": 52,
@ -2823,7 +2823,7 @@
{ {
"ID": 1302518, "ID": 1302518,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 18, "Level": 18,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 56, "Upgradenumber": 56,
@ -2836,7 +2836,7 @@
{ {
"ID": 1302519, "ID": 1302519,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 19, "Level": 19,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 59, "Upgradenumber": 59,
@ -2849,7 +2849,7 @@
{ {
"ID": 1302520, "ID": 1302520,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 20, "Level": 20,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 62, "Upgradenumber": 62,
@ -2862,7 +2862,7 @@
{ {
"ID": 1302521, "ID": 1302521,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 21, "Level": 21,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 65, "Upgradenumber": 65,
@ -2875,7 +2875,7 @@
{ {
"ID": 1302522, "ID": 1302522,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 22, "Level": 22,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 68, "Upgradenumber": 68,
@ -2888,7 +2888,7 @@
{ {
"ID": 1302523, "ID": 1302523,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 23, "Level": 23,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 71, "Upgradenumber": 71,
@ -2901,7 +2901,7 @@
{ {
"ID": 1302524, "ID": 1302524,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 24, "Level": 24,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 74, "Upgradenumber": 74,
@ -2914,7 +2914,7 @@
{ {
"ID": 1302525, "ID": 1302525,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 25, "Level": 25,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 77, "Upgradenumber": 77,
@ -2927,7 +2927,7 @@
{ {
"ID": 1302526, "ID": 1302526,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 26, "Level": 26,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 80, "Upgradenumber": 80,
@ -2940,7 +2940,7 @@
{ {
"ID": 1302527, "ID": 1302527,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 27, "Level": 27,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 83, "Upgradenumber": 83,
@ -2953,7 +2953,7 @@
{ {
"ID": 1302528, "ID": 1302528,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 28, "Level": 28,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 86, "Upgradenumber": 86,
@ -2966,7 +2966,7 @@
{ {
"ID": 1302529, "ID": 1302529,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 29, "Level": 29,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 89, "Upgradenumber": 89,
@ -2979,7 +2979,7 @@
{ {
"ID": 1302530, "ID": 1302530,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 30, "Level": 30,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 92, "Upgradenumber": 92,
@ -2992,7 +2992,7 @@
{ {
"ID": 1302531, "ID": 1302531,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 31, "Level": 31,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 95, "Upgradenumber": 95,
@ -3005,7 +3005,7 @@
{ {
"ID": 1302532, "ID": 1302532,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 32, "Level": 32,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 98, "Upgradenumber": 98,
@ -3018,7 +3018,7 @@
{ {
"ID": 1302533, "ID": 1302533,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 33, "Level": 33,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 101, "Upgradenumber": 101,
@ -3031,7 +3031,7 @@
{ {
"ID": 1302534, "ID": 1302534,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 34, "Level": 34,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 104, "Upgradenumber": 104,
@ -3044,7 +3044,7 @@
{ {
"ID": 1302535, "ID": 1302535,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 35, "Level": 35,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 107, "Upgradenumber": 107,
@ -3057,7 +3057,7 @@
{ {
"ID": 1302536, "ID": 1302536,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 36, "Level": 36,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 110, "Upgradenumber": 110,
@ -3070,7 +3070,7 @@
{ {
"ID": 1302537, "ID": 1302537,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 37, "Level": 37,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 113, "Upgradenumber": 113,
@ -3083,7 +3083,7 @@
{ {
"ID": 1302538, "ID": 1302538,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 38, "Level": 38,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 116, "Upgradenumber": 116,
@ -3096,7 +3096,7 @@
{ {
"ID": 1302539, "ID": 1302539,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 39, "Level": 39,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 119, "Upgradenumber": 119,
@ -3109,7 +3109,7 @@
{ {
"ID": 1302540, "ID": 1302540,
"Arms": 302501, "Arms": 302501,
"Name": "", "Name": "飞镖",
"Level": 40, "Level": 40,
"Upgrade": 30250101, "Upgrade": 30250101,
"Upgradenumber": 0, "Upgradenumber": 0,
@ -3142,7 +3142,7 @@
"Upgradegold": 420, "Upgradegold": 420,
"Attack": 0, "Attack": 0,
"HP": 1590, "HP": 1590,
"Getskill": 0, "Getskill": 3026040,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -3194,7 +3194,7 @@
"Upgradegold": 1200, "Upgradegold": 1200,
"Attack": 0, "Attack": 0,
"HP": 8115, "HP": 8115,
"Getskill": 0, "Getskill": 3026041,
"Unlock": 0 "Unlock": 0
}, },
{ {
@ -3246,7 +3246,7 @@
"Upgradegold": 1920, "Upgradegold": 1920,
"Attack": 0, "Attack": 0,
"HP": 17420, "HP": 17420,
"Getskill": 0, "Getskill": 3026042,
"Unlock": 0 "Unlock": 0
}, },
{ {

View File

@ -283,50 +283,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0e6c3f75dfca4314999718542858d47d, type: 3} m_Script: {fileID: 11500000, guid: 0e6c3f75dfca4314999718542858d47d, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &326901484
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 326901486}
- component: {fileID: 326901485}
m_Layer: 0
m_Name: adm
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &326901485
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 326901484}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab33bcf0d5772b145a71e111b94ff711, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &326901486
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 326901484}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2364.638, y: -36.597237, z: -0.123999946}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &372373522 --- !u!1 &372373522
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -732,7 +688,7 @@ Transform:
m_GameObject: {fileID: 1708146006} m_GameObject: {fileID: 1708146006}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -24.5, y: 6.2, z: 0} m_LocalPosition: {x: -21.4, y: 6.2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -794,12 +750,23 @@ Transform:
m_GameObject: {fileID: 2021164978} m_GameObject: {fileID: 2021164978}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 21.9, y: 6.200001, z: 0} m_LocalPosition: {x: 19.1, y: 6.200001, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 899280138} m_Father: {fileID: 899280138}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2100450367 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 9000772344992984436, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
m_PrefabInstance: {fileID: 2797205720893150715}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b9e781533d46ea41b16c0207c7d4376, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1342676675212828798 --- !u!1001 &1342676675212828798
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -922,13 +889,49 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 650189468646652440, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 243171027862406997, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchorMax.x
value: -0.0000032498758 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1532811897321479711, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 243171027862406997, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 243171027862406997, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 243171027862406997, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 528826267512590966, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 528826267512590966, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 528826267512590966, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 528826267512590966, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1665911083449093460, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -0.0000032498758 value: -111.904785
objectReference: {fileID: 0}
- target: {fileID: 2574726802163157375, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.x
value: -27.221924
objectReference: {fileID: 0}
- target: {fileID: 2662286465274299668, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2687063965730892539, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 2687063965730892539, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
@ -938,13 +941,13 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2703744668847977621, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 2918795219920107842, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 360.00003 value: 114.15991
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2703744668847977621, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 2921766666265342482, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0.0000118310445 value: -0.0011856371
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3005541637376198884, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 3005541637376198884, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
@ -954,6 +957,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3013028099631266930, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3254490145894505257, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 3254490145894505257, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 0 value: 0
@ -966,9 +973,37 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3924915755643395529, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 3266282737059014160, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3339919109361498372, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3339919109361498372, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3339919109361498372, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3339919109361498372, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3504301148192295494, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3504301148192295494, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3535150357896660372, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0.00001183105 value: 0.000009536743
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4086530264551283400, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 4086530264551283400, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
@ -978,13 +1013,13 @@ PrefabInstance:
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4576839497981118481, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 4086530264551283400, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchorMin.y
value: -1.4701469e-12 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4743637259142969288, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 4857330973713300467, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_IsActive
value: -0.000003553884 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4892172892484661290, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 4892172892484661290, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
@ -998,13 +1033,89 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8630107263903414318, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 5101466207984114834, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5101466207984114834, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5223320113814838066, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5223320113814838066, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5260272100325979286, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5421308355464003349, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5610340814941642952, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_Size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5794036599742186259, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_Value
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5828942971782581090, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5828942971782581090, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6402981133169486863, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6402981133169486863, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6788654942803207861, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -81.609375
objectReference: {fileID: 0}
- target: {fileID: 7017910154464183053, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.00001020357
objectReference: {fileID: 0}
- target: {fileID: 7146434732382592202, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7146434732382592202, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 359.99997 value: 0.000017166138
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8630107263903414318, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 7146434732382592202, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -0.000010355754 value: -0.00012395334
objectReference: {fileID: 0}
- target: {fileID: 7353981888873689265, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000009536743
objectReference: {fileID: 0}
- target: {fileID: 7637600488991758092, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_Size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7798967289364784859, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7798967289364784859, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8734534549119924968, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 8734534549119924968, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
@ -1014,17 +1125,21 @@ PrefabInstance:
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8734534549119924968, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8740125470161128311, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 8740125470161128311, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Canvas value: Canvas
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8849191488238675942, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 8845859242310593705, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 2534.0264 value: -0.000049591064
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8849191488238675942, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 8845859242310593705, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -0.000037788843 value: -0.0008746868
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9144618406897127126, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3} - target: {fileID: 9144618406897127126, guid: 0e52b314be6e069439c3bb54fb42807e, type: 3}
propertyPath: m_Pivot.x propertyPath: m_Pivot.x
@ -1216,6 +1331,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3880219494830862424, guid: bacfc73082021e74fb5a3350751b6793, type: 3}
propertyPath: uiMgr
value:
objectReference: {fileID: 2100450367}
- target: {fileID: 3880219494830862424, guid: bacfc73082021e74fb5a3350751b6793, type: 3} - target: {fileID: 3880219494830862424, guid: bacfc73082021e74fb5a3350751b6793, type: 3}
propertyPath: abManager propertyPath: abManager
value: value:
@ -1306,4 +1425,3 @@ SceneRoots:
- {fileID: 5136891001902902207} - {fileID: 5136891001902902207}
- {fileID: 1446036770} - {fileID: 1446036770}
- {fileID: 2509702802398009321} - {fileID: 2509702802398009321}
- {fileID: 326901486}

View File

@ -290,7 +290,7 @@ public class BattleManager : MonoBehaviour
{ {
foreach (var p in playerItems) foreach (var p in playerItems)
{ {
if (p.player!=null) if (p!=null&&p.player!=null)
{ {
PrefabPool.ins.RecycleObj(p.player.gameObject); PrefabPool.ins.RecycleObj(p.player.gameObject);
p.player = null; p.player = null;

View File

@ -38,9 +38,18 @@ public static class DataManager
} }
private static Dictionary<int, int> itemDictionary; private static Dictionary<int, int> itemDictionary;
public static int GuidInt(int key)
{
return (int)LoadValue(typeof(int), "guidItem"+key);
}
public static void SaveGuidItem(int key,int num)
{
SaveValue("guidItem" + key, num);
}
public static int GetItem(int id) public static int GetItem(int id)
{ {
return ItemDictionary.ContainsKey(id) ? ItemDictionary[id] : 0; return (ItemDictionary.ContainsKey(id) ? ItemDictionary[id] : 0)+GuidInt(id);
//return ItemDatas.FirstOrDefault(vaItemData => vaItemData.item.id == id); //return ItemDatas.FirstOrDefault(vaItemData => vaItemData.item.id == id);
} }

View File

@ -9,6 +9,7 @@ using Random = UnityEngine.Random;
public class GameSystem : MonoBehaviour public class GameSystem : MonoBehaviour
{ {
public static GameSystem ins; public static GameSystem ins;
public UIMgr uiMgr;
public JsonTab tab; public JsonTab tab;
public DrawingManager drawingManager; public DrawingManager drawingManager;
public AssetBundleManager abManager; public AssetBundleManager abManager;
@ -42,12 +43,19 @@ public class GameSystem : MonoBehaviour
{ {
DataManager.SetLevelLock(int.Parse(JsonTab.Instance.tables.Main.Get(20).ConstantValue),true); DataManager.SetLevelLock(int.Parse(JsonTab.Instance.tables.Main.Get(20).ConstantValue),true);
DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(21).ConstantValue), true); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(21).ConstantValue), true);
UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(21).ConstantValue));
DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(22).ConstantValue), true); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(22).ConstantValue), true);
UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(22).ConstantValue));
DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(23).ConstantValue), true); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(23).ConstantValue), true);
UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(23).ConstantValue));
DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(24).ConstantValue), true); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(24).ConstantValue), true);
UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(24).ConstantValue));
DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(25).ConstantValue), true); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(25).ConstantValue), true);
UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(25).ConstantValue));
DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(26).ConstantValue), true); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(26).ConstantValue), true);
UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(26).ConstantValue));
DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(27).ConstantValue), true); DataManager.SaveItemUnLock(int.Parse(JsonTab.Instance.tables.Main.Get(27).ConstantValue), true);
UnlockItem(int.Parse(JsonTab.Instance.tables.Main.Get(27).ConstantValue));
DataManager.SaveItemUnLock(1, true); DataManager.SaveItemUnLock(1, true);
DataManager.SaveItemUnLock(2, true); DataManager.SaveItemUnLock(2, true);
DataManager.SaveItemUnLock(3, true); DataManager.SaveItemUnLock(3, true);
@ -61,6 +69,32 @@ public class GameSystem : MonoBehaviour
DataManager.SaveDrawLevel(302401, 1); DataManager.SaveDrawLevel(302401, 1);
DataManager.SaveDrawLevel(302501, 1); DataManager.SaveDrawLevel(302501, 1);
DataManager.SaveDrawLevel(302601, 1); DataManager.SaveDrawLevel(302601, 1);
DataManager.SaveItem(1011,int.Parse(JsonTab.Instance.tables.Main.Get(28).ConstantValue));
DataManager.SaveItem(1021,int.Parse(JsonTab.Instance.tables.Main.Get(29).ConstantValue));
DataManager.SaveItem(1031,int.Parse(JsonTab.Instance.tables.Main.Get(30).ConstantValue));
DataManager.SaveItem(1041,int.Parse(JsonTab.Instance.tables.Main.Get(31).ConstantValue));
DataManager.SaveItem(1051,int.Parse(JsonTab.Instance.tables.Main.Get(32).ConstantValue));
}
private void UnlockItem(int id)
{
var data = JsonTab.Instance.tables.CraftingRecipes.Get(id);
if (data.Levelprops1!=0)
{
DataManager.SaveItemUnLock(data.Levelprops1,true);
}
if (data.Levelprops2!=0)
{
DataManager.SaveItemUnLock(data.Levelprops2,true);
}
if (data.Levelprops3!=0)
{
DataManager.SaveItemUnLock(data.Levelprops3,true);
}
if (data.Levelprops4!=0)
{
DataManager.SaveItemUnLock(data.Levelprops4,true);
}
} }
private void Awake() private void Awake()
{ {
@ -118,9 +152,14 @@ public class GameSystem : MonoBehaviour
forgePanel.ResetSlotItem(); forgePanel.ResetSlotItem();
_npcBuyDatas = new List<NPCBuyData>(); _npcBuyDatas = new List<NPCBuyData>();
getNpc = false; getNpc = false;
uiMgr.Init();
SaveFirstID(); SaveFirstID();
UIMgr.ins.OpenForgePanel(); UIMgr.ins.OpenForgePanel();
forgePanel.ResetGold(); forgePanel.ResetGold();
if (DataManager.GetPrefab("firstGuideV1")!=1)
{
uiMgr.OpenFirstGuidePanel();
}
}); });
// abManager.InitAsset(() => // abManager.InitAsset(() =>
@ -183,6 +222,7 @@ public class GameSystem : MonoBehaviour
/// </summary> /// </summary>
public void StartNpcData() public void StartNpcData()
{ {
_npcBuyDatas.Clear();
foreach (var data in JsonTab.Instance.tables.Item.DataList) foreach (var data in JsonTab.Instance.tables.Item.DataList)
{ {
if (DataManager.GetItemUnLock(data.ID) && data.NPC.Count != 0) if (DataManager.GetItemUnLock(data.ID) && data.NPC.Count != 0)
@ -198,6 +238,21 @@ public class GameSystem : MonoBehaviour
SaveFirstID(); SaveFirstID();
} }
public void GuidData()
{
NPCBuyData npcBuyData = new NPCBuyData();
npcBuyData.buyID = 2011;
npcBuyData.npcID = 50007;
_npcBuyDatas.Add(npcBuyData);
NPCBuyData npcBuyData1 = new NPCBuyData();
npcBuyData1.buyID = 2011;
npcBuyData1.npcID = 50008;
_npcBuyDatas.Add(npcBuyData);
DataManager.SaveGuidItem(1011,3);
nowTime = 0;
SaveFirstID();
}
public void SaveNPCbo(bool bo) public void SaveNPCbo(bool bo)
{ {
getNpc = bo; getNpc = bo;
@ -228,6 +283,12 @@ public class GameSystem : MonoBehaviour
forgePanel.OpenStartPanel(); forgePanel.OpenStartPanel();
} }
public void CloseStore()
{
_npcBuyDatas.Clear();
forgePanel.OpenStartPanel();
nowTime = maxTime;
}
/// <summary> /// <summary>
/// 设置购买物品和无物品判断 /// 设置购买物品和无物品判断
/// </summary> /// </summary>
@ -254,11 +315,15 @@ public class GameSystem : MonoBehaviour
{ {
drawingManager.CraftItem(bo, () => drawingManager.CraftItem(bo, () =>
{ {
forgePanel.ResetItemData(); ResetItemPanel();
forgePanel.ResetSlotItem();
}); });
} }
public void ResetItemPanel()
{
forgePanel.ResetItemData();
forgePanel.ResetSlotItem();
}
public void SaveSeledID(int sendID) public void SaveSeledID(int sendID)
{ {
id = sendID; id = sendID;
@ -365,4 +430,12 @@ public class GameSystem : MonoBehaviour
} }
} }
} }
public void GuideV2()
{
var npcData = _npcBuyDatas[0];
_npcBuyDatas.Remove(_npcBuyDatas[0]);
SaveFirstID();
forgePanel.SetData(true,npcData);
}
} }

View File

@ -32,6 +32,7 @@ public class BattlePanel : MonoBehaviour
[SerializeField] private Button openWeaponry; [SerializeField] private Button openWeaponry;
[SerializeField] private Button openSoldier; [SerializeField] private Button openSoldier;
[SerializeField] private Button startButton; [SerializeField] private Button startButton;
[SerializeField] private Button closeBaterWaitButton;
[SerializeField] private int levelID = 0; [SerializeField] private int levelID = 0;
[SerializeField] private Text _goldNum; [SerializeField] private Text _goldNum;
@ -57,7 +58,7 @@ public class BattlePanel : MonoBehaviour
openItemParent.onClick.AddListener(OpenItemPanel); openItemParent.onClick.AddListener(OpenItemPanel);
closeItemParent.onClick.AddListener(CloseItemPanel); closeItemParent.onClick.AddListener(CloseItemPanel);
startButton.onClick.AddListener(StartBattle); startButton.onClick.AddListener(StartBattle);
readyPanel.SetActive(false); closeBaterWaitButton.onClick.AddListener(CloseWaitPanel);
} }
// Update is called once per frame // Update is called once per frame
@ -74,6 +75,7 @@ public class BattlePanel : MonoBehaviour
openItemParent.onClick.RemoveListener(OpenItemPanel); openItemParent.onClick.RemoveListener(OpenItemPanel);
closeItemParent.onClick.RemoveListener(CloseItemPanel); closeItemParent.onClick.RemoveListener(CloseItemPanel);
startButton.onClick.RemoveListener(StartBattle); startButton.onClick.RemoveListener(StartBattle);
closeBaterWaitButton.onClick.RemoveListener(CloseWaitPanel);
} }
#endregion #endregion
@ -99,6 +101,7 @@ public class BattlePanel : MonoBehaviour
} }
DataManager.SetNowLevel(levelID); DataManager.SetNowLevel(levelID);
OpenLevel(); OpenLevel();
readyPanel.SetActive(false);
} }
public void OpenLevel() public void OpenLevel()
{ {
@ -110,10 +113,9 @@ public class BattlePanel : MonoBehaviour
ResetGold(); ResetGold();
} }
private void OpenCombatPanel() public void OpenCombatPanel()
{ {
if (DataManager.GetPhysical()>=5)
{
DataManager.RemovePhysical(); DataManager.RemovePhysical();
readyPanel.SetActive(true); readyPanel.SetActive(true);
UIMgr.ins.CloseSwithPanel(); UIMgr.ins.CloseSwithPanel();
@ -130,9 +132,12 @@ public class BattlePanel : MonoBehaviour
BattleManager.ins.GetAttribute(ref h, ref a); BattleManager.ins.GetAttribute(ref h, ref a);
_hpText.text = h.ToString(); _hpText.text = h.ToString();
_attackText.text = a.ToString(); _attackText.text = a.ToString();
}
} }
public void CloseWaitPanel()
{
UIMgr.ins.OpenBattlePanel();
}
public void SetPlayerIndex() public void SetPlayerIndex()
{ {
foreach (var pBar in _playerBars) foreach (var pBar in _playerBars)
@ -210,8 +215,9 @@ public class BattlePanel : MonoBehaviour
private void StartBattle() private void StartBattle()
{ {
if (BattleManager.ins.BattleStart()) if (BattleManager.ins.BattleStart()&& DataManager.GetPhysical()>=5)
{ {
DataManager.RemovePhysical();
BattleManager.ins.StartBattle(); BattleManager.ins.StartBattle();
} }
} }
@ -228,14 +234,20 @@ public class BattlePanel : MonoBehaviour
private void OpenVideoWeaponryEvent() private void OpenVideoWeaponryEvent()
{ {
BattleManager.ins.OpenVideoWeaponryEvent(); ADSystem.getInstance().PlayAd(() =>
ResetReadyPanel(); {
BattleManager.ins.OpenVideoWeaponryEvent();
ResetReadyPanel();
});
} }
private void OpenVideoSoldierEvent() private void OpenVideoSoldierEvent()
{ {
BattleManager.ins.OpenVideoSoldierEvent(); ADSystem.getInstance().PlayAd(() =>
ResetReadyPanel(); {
BattleManager.ins.OpenVideoSoldierEvent();
ResetReadyPanel();
});
} }
#endregion #endregion

View File

@ -49,6 +49,10 @@ public class CombatPanel : MonoBehaviour
_rogenPanel.gameObject.SetActive(true); _rogenPanel.gameObject.SetActive(true);
_rogenPanel.SetResetIndex(1); _rogenPanel.SetResetIndex(1);
_rogenPanel.InitData(); _rogenPanel.InitData();
if (DataManager.GetPrefab("firstGuideV3")!=1)
{
UIMgr.ins.OpenFirstGuidePanelv3();
}
} }
public void CloseRogenPanel() public void CloseRogenPanel()

View File

@ -56,7 +56,7 @@ public class RogenItem : MonoBehaviour
} }
private void SendEvent() public void SendEvent()
{ {
BattleManager.ins.SetRogen(skillData); BattleManager.ins.SetRogen(skillData);
UIMgr.ins.CloseRogenPanel(); UIMgr.ins.CloseRogenPanel();

View File

@ -29,6 +29,7 @@ public class ForgePanel : MonoBehaviour
[SerializeField] private Button title; [SerializeField] private Button title;
[SerializeField] public Button _buyEventButton; [SerializeField] public Button _buyEventButton;
[SerializeField] private Button _getGoldButton; [SerializeField] private Button _getGoldButton;
[SerializeField] private Button closeStoreButton;
[SerializeField] private Text textPro; [SerializeField] private Text textPro;
[SerializeField] private CraftingPanel _craftingPanel; [SerializeField] private CraftingPanel _craftingPanel;
[SerializeField] private SettlementPanel _settlementPanel; [SerializeField] private SettlementPanel _settlementPanel;
@ -57,6 +58,7 @@ public class ForgePanel : MonoBehaviour
_craftButton.onClick.AddListener(CraftEvent); _craftButton.onClick.AddListener(CraftEvent);
startButton.onClick.AddListener(GameStart); startButton.onClick.AddListener(GameStart);
title.onClick.AddListener(CloseTitle); title.onClick.AddListener(CloseTitle);
closeStoreButton.onClick.AddListener(CloseStore);
} }
// Update is called once per frame // Update is called once per frame
@ -75,6 +77,7 @@ public class ForgePanel : MonoBehaviour
_npcTrigger.Close(); _npcTrigger.Close();
openParent.SetActive(true); openParent.SetActive(true);
_craftingPanel.gameObject.SetActive(false); _craftingPanel.gameObject.SetActive(false);
ResetItemData();
} }
public void OpenStartPanel() public void OpenStartPanel()
@ -82,6 +85,7 @@ public class ForgePanel : MonoBehaviour
openParent.SetActive(true); openParent.SetActive(true);
startAni.AnimationState.SetAnimation(0, "EnterAnim_1", false); startAni.AnimationState.SetAnimation(0, "EnterAnim_1", false);
startAni.AnimationState.Complete += StarIdle; startAni.AnimationState.Complete += StarIdle;
_settlementPanel.gameObject.SetActive(true);
_settlementPanel.SettlementEvent(); _settlementPanel.SettlementEvent();
} }
@ -106,25 +110,54 @@ public class ForgePanel : MonoBehaviour
_craftButton.onClick.RemoveListener(CraftEvent); _craftButton.onClick.RemoveListener(CraftEvent);
startButton.onClick.RemoveListener(GameStart); startButton.onClick.RemoveListener(GameStart);
title.onClick.RemoveListener(CloseTitle); title.onClick.RemoveListener(CloseTitle);
closeStoreButton.onClick.RemoveListener(CloseStore);
} }
void GameStart() void GameStart()
{ {
if (DataManager.GetPrefab("openDoor")==0)
if (DataManager.GetPhysical()>=5)
{ {
DotData.ins.SendEvent("a11103",""); DataManager.RemovePhysical();
ResetGold();
startAni.AnimationState.SetAnimation(0, "EnterAnim_2", false);
startAni.AnimationState.Complete += StartEvent;
if (DataManager.GetPrefab("openDoor")==0)
{
DotData.ins.SendEvent("a11103","");
}
if (DataManager.GetPrefab("openDoor")==1)
{
DotData.ins.SendEvent("a11104","");
}
if (DataManager.GetPrefab("openDoor")==3)
{
DotData.ins.SendEvent("a11105","");
}
DataManager.SetPrefab("openDoor",DataManager.GetPrefab("openDoor")+1);
startAni.AnimationState.SetAnimation(0, "EnterAnim_2", false);
startAni.AnimationState.Complete += StartEvent;
} }
if (DataManager.GetPrefab("openDoor")==1) }
{
DotData.ins.SendEvent("a11104",""); public void GuideV1()
} {
if (DataManager.GetPrefab("openDoor")==3) DataManager.RemovePhysical();
{ ResetGold();
DotData.ins.SendEvent("a11105","");
}
DataManager.SetPrefab("openDoor",DataManager.GetPrefab("openDoor")+1);
startAni.AnimationState.SetAnimation(0, "EnterAnim_2", false); startAni.AnimationState.SetAnimation(0, "EnterAnim_2", false);
startAni.AnimationState.Complete += StartEvent; startAni.AnimationState.Complete += GuideV1b;
}
public void GuideV1b(TrackEntry trackentry)
{
startAni.AnimationState.Complete -= GuideV1b;
GameSystem.ins.StartNpcData();
openParent.SetActive(false);
}
void CloseStore()
{
GameSystem.ins.CloseStore();
} }
private void StartEvent(TrackEntry trackentry) private void StartEvent(TrackEntry trackentry)
@ -142,6 +175,16 @@ public class ForgePanel : MonoBehaviour
GameSystem.ins.Crafting(bo); GameSystem.ins.Crafting(bo);
}); });
} }
public void CraftGuideEvent(Action action)
{
_craftingPanel.gameObject.SetActive(true);
_craftingPanel.StartOpen(true, (bool bo) =>
{
GameSystem.ins.Crafting(bo);
action?.Invoke();
});
}
public void ResetCrafting(int id,int npcID) public void ResetCrafting(int id,int npcID)
{ {
getCrafting.SaveIcon(id); getCrafting.SaveIcon(id);
@ -220,7 +263,7 @@ public class ForgePanel : MonoBehaviour
int index = 0; int index = 0;
for (int i = 0; i < allData.Count; i++) for (int i = 0; i < allData.Count; i++)
{ {
if (DataManager.GetItem(allData[i].ID)>0&&allData[i].Proptype!=0&&allData[i].Proptype==1) if (DataManager.GetItem(allData[i].ID)>=0&&DataManager.GetItemUnLock(allData[i].ID)&&allData[i].Proptype!=0&&allData[i].Proptype==1)
{ {
if (index>=_itemButtons.Count ) if (index>=_itemButtons.Count )
{ {
@ -246,7 +289,7 @@ public class ForgePanel : MonoBehaviour
int index = 0; int index = 0;
for (int i = 0; i < allData.Count; i++) for (int i = 0; i < allData.Count; i++)
{ {
if (DataManager.GetItem(allData[i].ID)>0&&allData[i].Proptype>1) if (DataManager.GetItem(allData[i].ID)>=0&&DataManager.GetItemUnLock(allData[i].ID)&&allData[i].Proptype>1)
{ {
if (index>=_itemWapenButtons.Count ) if (index>=_itemWapenButtons.Count )
{ {

View File

@ -0,0 +1,256 @@
using System;
using System.Collections;
using System.Collections.Generic;
using DG.Tweening;
using UnityEngine;
using UnityEngine.UI;
public class GuidePanel : MonoBehaviour
{
[SerializeField] private List<RectTransform> textList;
[SerializeField] private RectTransform seleTra;
[SerializeField] private Button eventButton;
[SerializeField] private ForgePanel _forgePanel;
[SerializeField] private BattlePanel _battlePanel;
[SerializeField] private RogenItem _rogenItem;
[SerializeField] private Image _sceleImage;
[SerializeField] private Text _text;
[SerializeField] private RectTransform text2Tra;
[SerializeField] private Text _text2;
[SerializeField] private GameObject crafting;
[SerializeField] private GameObject cra2;
[SerializeField] private RectTransform hand;
private Tween ani;
private Tween ani2;
[SerializeField] private RectTransform lock1;
[SerializeField] private RectTransform lock2;
[SerializeField] private RectTransform lock2c1;
[SerializeField] private RectTransform lock3;
[SerializeField] private RectTransform lock4;
[SerializeField] private RectTransform lock5;
[SerializeField] private RectTransform lock5c1;
[SerializeField] private RectTransform lock5c2;
[SerializeField] private RectTransform lock6;
[SerializeField] private RectTransform lock7;
[SerializeField] private RectTransform lock8;
private void Start()
{
}
public void GLock1()
{
_sceleImage.gameObject.SetActive(false);
_text.text = "点击开店";
text2Tra.position = textList[0].position;
_text2.gameObject.SetActive(false);
seleTra.position = lock1.position;
eventButton.onClick.AddListener(Event1);
}
private void Event1()
{
eventButton.onClick.RemoveListener(Event1);
seleTra.position = lock2.position;
eventButton.onClick.AddListener(SaveE1);
_sceleImage.gameObject.SetActive(true);
_text.text = "拖拽到锻造栏";
text2Tra.position = textList[3].position;
_forgePanel.GuideV1();
var data = JsonTab.Instance.tables.Item.Get(1011);
_sceleImage.sprite = AssetBundleManager.ins.Sprite(data.Icon, AtlasType.ItemIcon);
_sceleImage.GetComponent<RectTransform>().position = lock2.position;
ani2=_sceleImage.GetComponent<RectTransform>().DOMove(lock2c1.position, 1f).SetLoops(-1);
hand.localPosition = Vector3.zero;
ani.Kill();
ani= hand.GetComponent<RectTransform>().DOMove(lock2c1.position, 1f).SetLoops(-1);
}
private void SaveE1()
{
GameSystem.ins.drawingManager.itemsSlot[0] = 1011;
_forgePanel.ResetSlotItem();
eventButton.onClick.RemoveListener(SaveE1);
eventButton.onClick.AddListener(SaveE2);
}
private void SaveE2()
{
GameSystem.ins.drawingManager.itemsSlot[1] = 1011;
_forgePanel.ResetSlotItem();
eventButton.onClick.RemoveListener(SaveE2);
eventButton.onClick.AddListener(SaveE3);
}
private void SaveE3()
{
GameSystem.ins.drawingManager.itemsSlot[2] = 1011;
_forgePanel.ResetSlotItem();
eventButton.onClick.RemoveListener(SaveE3);
_sceleImage.gameObject.SetActive(false);
ani.Kill();
ani= hand.GetComponent<RectTransform>().DOLocalMove(Vector3.zero, 0.1f);
_text.text = "点击锻造";
text2Tra.position = textList[2].position;
seleTra.position = lock3.position;
eventButton.onClick.AddListener(Event2);
}
private void Event2()
{
eventButton.onClick.RemoveListener(Event2);
eventButton.gameObject.SetActive(false);
GetComponent<Image>().enabled = false;
seleTra.gameObject.SetActive(false);
_text2.gameObject.SetActive(true);
_text2.text = "在红色区域点击加速";
_forgePanel.CraftGuideEvent(() =>
{
Event3();
});
}
private void Event3()
{
seleTra.gameObject.SetActive(true);
seleTra.position = lock2c1.position;
eventButton.onClick.AddListener(Event4);
eventButton.gameObject.SetActive(true);
_text2.gameObject.SetActive(false);
GetComponent<Image>().enabled = true;
_text.text = "点击任意区域关闭页面";
text2Tra.position = textList[0].position;
}
private void Event4()
{
seleTra.position = lock5.position;
crafting.SetActive(false);
eventButton.onClick.RemoveListener(Event4);
eventButton.onClick.AddListener(Event4c1);
_text.text = "拖拽铁剑给客户";
text2Tra.position = textList[1].position;
_sceleImage.gameObject.SetActive(true);
var data = JsonTab.Instance.tables.Item.Get(2011);
_sceleImage.sprite = AssetBundleManager.ins.Sprite(data.Icon, AtlasType.ItemIcon);
ani2.Kill();
_sceleImage.GetComponent<RectTransform>().position = lock5.position;
ani2=_sceleImage.GetComponent<RectTransform>().DOMove(lock5c1.position, 1f).SetLoops(-1);
hand.localPosition = Vector3.zero;
ani.Kill();
ani=hand.GetComponent<RectTransform>().DOMove(lock5c1.position, 1f).SetLoops(-1);
}
private void Event4c1()
{
_sceleImage.gameObject.SetActive(false);
seleTra.position = lock2c1.position;
ani.Kill();
ani= hand.GetComponent<RectTransform>().DOLocalMove(Vector3.zero, 0.1f);
eventButton.onClick.RemoveListener(Event4c1);
eventButton.onClick.AddListener(Event5);
GameSystem.ins.GuideV2();
_text.text = "点击关闭";
text2Tra.position = textList[0].position;
}
private void Event5()
{
seleTra.position = lock4.position;
cra2.SetActive(false);
eventButton.onClick.RemoveListener(Event5);
eventButton.onClick.AddListener(Event6);
_text.text = "点击关店";
text2Tra.position = textList[1].position;
}
private void Event6()
{
seleTra.position = lock5c2.position;
eventButton.onClick.RemoveListener(Event6);
GameSystem.ins.CloseStore();
eventButton.onClick.AddListener(Event6c1);
}
private void Event6c1()
{
eventButton.onClick.RemoveListener(Event6c1);
UIMgr.ins.OpenBattlePanel();
DataManager.SetPrefab("firstGuideV1",1);
}
public void Event7()
{
_sceleImage.gameObject.SetActive(false);
_text2.gameObject.SetActive(false);
seleTra.position = lock6.position;
_text.text = "点击开始进入关卡";
text2Tra.position = textList[0].position;
eventButton.onClick.AddListener(Event8);
}
private void Event8()
{
eventButton.onClick.RemoveListener(Event8);
seleTra.position = lock7.position;
_text.text = "点击放置武器";
text2Tra.position = textList[0].position;
DataManager.AddItem(2011,3);
_battlePanel.OpenCombatPanel();
eventButton.onClick.AddListener(Event9);
}
private void Event9()
{
eventButton.onClick.RemoveListener(Event9);
BattleManager.ins.GetItemNum(2011,out var itemNum);
if (DataManager.GetItem(2011) - itemNum-1>=0)
{
BattleManager.ins.AddItem(2011,out bool bo);
UIMgr.ins.ResetBattleReadyPanel();
}
eventButton.onClick.AddListener(Event10);
}
private void Event10()
{
eventButton.onClick.RemoveListener(Event10);
BattleManager.ins.GetItemNum(2011,out var itemNum);
if (DataManager.GetItem(2011) - itemNum-1>=0)
{
BattleManager.ins.AddItem(2011,out bool bo);
UIMgr.ins.ResetBattleReadyPanel();
}
eventButton.onClick.AddListener(Event11);
}
private void Event11()
{
eventButton.onClick.RemoveListener(Event11);
BattleManager.ins.GetItemNum(2011,out var itemNum);
if (DataManager.GetItem(2011) - itemNum-1>=0)
{
BattleManager.ins.AddItem(2011,out bool bo);
UIMgr.ins.ResetBattleReadyPanel();
}
seleTra.position = lock8.position;
_text.text = "点击开始游戏";
eventButton.onClick.AddListener(Event12);
}
private void Event12()
{
eventButton.onClick.RemoveListener(Event12);
gameObject.SetActive(false);
BattleManager.ins.StartBattle();
DataManager.SetPrefab("firstGuideV2",1);
}
public void Event13()
{
_sceleImage.gameObject.SetActive(false);
_text2.gameObject.SetActive(false);
seleTra.position = _rogenItem.transform.position;
_text.text = "点击随机技能";
text2Tra.position = textList[0].position;
eventButton.onClick.AddListener(Event14);
}
public void Event14()
{
gameObject.SetActive(false);
_rogenItem.SendEvent();
eventButton.onClick.RemoveListener(Event14);
DataManager.SetPrefab("firstGuideV3",1);
}
}

View File

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

View File

@ -1,3 +1,4 @@
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -8,18 +9,41 @@ public class SlotUI : MonoBehaviour
[SerializeField] private int index; [SerializeField] private int index;
[SerializeField] private Image icon; [SerializeField] private Image icon;
[SerializeField] private Button _button;
private void Awake()
{
_button = GetComponent<Button>();
}
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
} }
private void OnEnable()
{
_button.onClick.AddListener(ButtonEvent);
}
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
} }
private void OnDisable()
{
_button.onClick.RemoveListener(ButtonEvent);
}
public void ButtonEvent()
{
GameSystem.ins.drawingManager.itemsSlot[index] = 0;
GameSystem.ins.ResetItemPanel();
}
public void SaveIndex() public void SaveIndex()
{ {
GameSystem.ins.SaveIndex(index); GameSystem.ins.SaveIndex(index);

View File

@ -18,6 +18,9 @@ public class StorePanel : MonoBehaviour
[SerializeField] private GameObject stroeback; [SerializeField] private GameObject stroeback;
[SerializeField] private Button lottery; [SerializeField] private Button lottery;
[SerializeField] private GameObject lotteryback; [SerializeField] private GameObject lotteryback;
[SerializeField] private Text _goldNum;
[SerializeField] private Text _diamondNum;
[SerializeField] private Text _physicalNum;
private void Awake() private void Awake()
{ {
@ -62,6 +65,7 @@ public class StorePanel : MonoBehaviour
lotteryParent.SetActive(false); lotteryParent.SetActive(false);
stroeback.gameObject.SetActive(true); stroeback.gameObject.SetActive(true);
lotteryback.gameObject.SetActive(false); lotteryback.gameObject.SetActive(false);
ResetGold();
} }
public void ResetLottery() public void ResetLottery()
@ -75,6 +79,7 @@ public class StorePanel : MonoBehaviour
lotteryParent.SetActive(true); lotteryParent.SetActive(true);
stroeback.gameObject.SetActive(false); stroeback.gameObject.SetActive(false);
lotteryback.gameObject.SetActive(true); lotteryback.gameObject.SetActive(true);
ResetGold();
} }
public void SetRandomData(int id) public void SetRandomData(int id)
@ -98,5 +103,17 @@ public class StorePanel : MonoBehaviour
{ {
_panel.gameObject.SetActive(true); _panel.gameObject.SetActive(true);
_panel.SaveData(itemDatas); _panel.SaveData(itemDatas);
foreach (var s in dayStoreItems)
{
s.ResetItem();
}
ResetGold();
}
public void ResetGold()
{
_goldNum.text = DataManager.GetItem(2).ToString();
_diamondNum.text = DataManager.GetItem(3).ToString();
_physicalNum.text=DataManager.GetPhysical().ToString();
} }
} }

View File

@ -8,6 +8,7 @@ public class StoreItem : MonoBehaviour
{ {
[SerializeField] private int id; [SerializeField] private int id;
[SerializeField] private Image icon; [SerializeField] private Image icon;
[SerializeField] private Image buyIcon;
[SerializeField] private Sprite storeIcon; [SerializeField] private Sprite storeIcon;
[SerializeField] private Text name; [SerializeField] private Text name;
[SerializeField] private Text num; [SerializeField] private Text num;
@ -46,10 +47,12 @@ public class StoreItem : MonoBehaviour
if (DataManager.NextDay("storeDay"+id)) if (DataManager.NextDay("storeDay"+id))
{ {
num.text = "免费获得"; num.text = "免费获得";
_button.interactable = true;
} }
else else
{ {
num.text = "已售罄"; num.text = "已售罄";
_button.interactable = false;
} }
} }
else if (id == 102 || id == 104) else if (id == 102 || id == 104)

View File

@ -15,6 +15,7 @@ public class SwithPanel : MonoBehaviour
[SerializeField] private Button shopButton; [SerializeField] private Button shopButton;
[SerializeField] private Button battleButton; [SerializeField] private Button battleButton;
[SerializeField] private List<GameObject> _gameObjects;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
@ -63,4 +64,13 @@ public class SwithPanel : MonoBehaviour
{ {
UIMgr.ins.OpenBattlePanel(); UIMgr.ins.OpenBattlePanel();
} }
public void SetIndex(int index)
{
foreach (var gameObject in _gameObjects)
{
gameObject.SetActive(false);
}
_gameObjects[index].SetActive(true);
}
} }

View File

@ -17,8 +17,14 @@ public class UIMgr : MonoBehaviour
[SerializeField] private StorePanel storePanel; [SerializeField] private StorePanel storePanel;
[SerializeField] private CombatPanel combatPanel; [SerializeField] private CombatPanel combatPanel;
[SerializeField] private EndPanel endPanel; [SerializeField] private EndPanel endPanel;
[SerializeField] private GuidePanel guidePanel;
private void Awake() private void Awake()
{
}
public void Init()
{ {
ins = this; ins = this;
} }
@ -32,7 +38,8 @@ public class UIMgr : MonoBehaviour
storePanel.gameObject.SetActive(false); storePanel.gameObject.SetActive(false);
combatPanel.gameObject.SetActive(false); combatPanel.gameObject.SetActive(false);
endPanel.gameObject.SetActive(false); endPanel.gameObject.SetActive(false);
forgePanel.OpenStartPanel(); forgePanel.Close();
swithPanel.SetIndex(2);
} }
public void OpenBattlePanel() public void OpenBattlePanel()
@ -45,6 +52,12 @@ public class UIMgr : MonoBehaviour
combatPanel.gameObject.SetActive(false); combatPanel.gameObject.SetActive(false);
endPanel.gameObject.SetActive(false); endPanel.gameObject.SetActive(false);
battlePanel.ResetLevelID(); battlePanel.ResetLevelID();
if (DataManager.GetPrefab("firstGuideV2")!=1)
{
guidePanel.gameObject.SetActive(true);
guidePanel.Event7();
}
swithPanel.SetIndex(3);
} }
public void OpenDrawingPanel() public void OpenDrawingPanel()
@ -57,6 +70,7 @@ public class UIMgr : MonoBehaviour
combatPanel.gameObject.SetActive(false); combatPanel.gameObject.SetActive(false);
endPanel.gameObject.SetActive(false); endPanel.gameObject.SetActive(false);
drawingPanel.OpenPanel(); drawingPanel.OpenPanel();
swithPanel.SetIndex(1);
} }
public void OpenStorePanel() public void OpenStorePanel()
@ -69,6 +83,7 @@ public class UIMgr : MonoBehaviour
combatPanel.gameObject.SetActive(false); combatPanel.gameObject.SetActive(false);
endPanel.gameObject.SetActive(false); endPanel.gameObject.SetActive(false);
storePanel.StartPanel(); storePanel.StartPanel();
swithPanel.SetIndex(0);
} }
/// <summary> /// <summary>
/// 战斗过程界面 /// 战斗过程界面
@ -126,8 +141,17 @@ public class UIMgr : MonoBehaviour
{ {
combatPanel.ResetExp(); combatPanel.ResetExp();
} }
public void OpenFirstGuidePanel()
{
guidePanel.gameObject.SetActive(true);
guidePanel.GLock1();
}
public void OpenFirstGuidePanelv3()
{
guidePanel.gameObject.SetActive(true);
guidePanel.Event13();
}
public void ResetCombatSkill() public void ResetCombatSkill()
{ {
} }

View File

@ -9,17 +9,17 @@ MonoBehaviour:
m_GameObject: {fileID: 0} m_GameObject: {fileID: 0}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 0} m_Script: {fileID: 1795359250, guid: 1cf430f187a0b40eda7f668318d8be23, type: 3}
m_Name: MiniGameConfig m_Name: MiniGameConfig
m_EditorClassIdentifier: wx-editor:WeChatWASM:WXEditorScriptObject m_EditorClassIdentifier:
ProjectConf: ProjectConf:
projectName: projectName:
Appid: Appid:
CDN: CDN: https://www.youtukeji.com.cn/Game/Blacksmithv2/
assetLoadType: 0 assetLoadType: 0
compressDataPackage: 0 compressDataPackage: 0
VideoUrl: VideoUrl:
DST: E:\UnityProject\Game\Blacksmith\ DST: E:\Project\apk\Blacksmith
StreamCDN: StreamCDN:
bundleHashLength: 32 bundleHashLength: 32
bundlePathIdentifier: StreamingAssets; bundlePathIdentifier: StreamingAssets;
@ -29,7 +29,7 @@ MonoBehaviour:
HideAfterCallMain: 1 HideAfterCallMain: 1
preloadFiles: preloadFiles:
Orientation: 0 Orientation: 0
bgImageSrc: Assets/WX-WASM-SDK-V2/Runtime/wechat-default/images/background.jpg bgImageSrc: Assets/Pack/UI/73afa3a036cbd7a57cba1c3fca347f0.jpg
dataFileSubPrefix: dataFileSubPrefix:
maxStorage: 200 maxStorage: 200
defaultReleaseSize: 31457280 defaultReleaseSize: 31457280

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -3,6 +3,7 @@
"com.code-philosophy.luban": "https://gitee.com/focus-creative-games/luban_unity.git", "com.code-philosophy.luban": "https://gitee.com/focus-creative-games/luban_unity.git",
"com.tuyoogame.yooasset": "2.2.4-preview", "com.tuyoogame.yooasset": "2.2.4-preview",
"com.unity.collab-proxy": "2.4.4", "com.unity.collab-proxy": "2.4.4",
"com.unity.device-simulator.devices": "1.0.0",
"com.unity.feature.2d": "2.0.1", "com.unity.feature.2d": "2.0.1",
"com.unity.ide.rider": "3.0.31", "com.unity.ide.rider": "3.0.31",
"com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.visualstudio": "2.0.22",

View File

@ -139,6 +139,13 @@
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.device-simulator.devices": {
"version": "1.0.0",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
},
"com.unity.editorcoroutines": { "com.unity.editorcoroutines": {
"version": "1.0.0", "version": "1.0.0",
"depth": 1, "depth": 1,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 12 KiB