Commit 92d92762 authored by Hà Trung (NEGAXY)'s avatar Hà Trung (NEGAXY)

no message

parent 5358fa5e
......@@ -21,14 +21,15 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: palette 1
m_Shader: {fileID: 4800000, guid: 7ffc1bc2bbb1ef64f84b552b2d2f0619, type: 3}
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: TCP2_REFLECTIONS_FRESNEL TCP2_RIM_LIGHTING_LIGHTMASK TCP2_SHADOW_LIGHT_COLOR
TCP2_UV_NORMALS_FULL
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
......
......@@ -26,8 +26,9 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
......
......@@ -21,14 +21,15 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: palette
m_Shader: {fileID: 4800000, guid: 7ffc1bc2bbb1ef64f84b552b2d2f0619, type: 3}
m_ShaderKeywords: TCP2_REFLECTIONS_FRESNEL TCP2_RIM_LIGHTING_LIGHTMASK TCP2_SHADOW_LIGHT_COLOR
TCP2_UV_NORMALS_FULL
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: TCP2_MOBILE TCP2_REFLECTIONS_FRESNEL TCP2_RIM_LIGHTING_LIGHTMASK
TCP2_SHADOW_LIGHT_COLOR TCP2_UV_NORMALS_FULL
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
m_CustomRenderQueue: 2000
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
......@@ -180,7 +181,7 @@ Material:
- _UseFresnelReflections: 1
- _UseMatCap: 0
- _UseMatCapMask: 0
- _UseMobileMode: 0
- _UseMobileMode: 1
- _UseNormalMap: 0
- _UseOcclusion: 0
- _UseOutline: 0
......
fileFormatVersion: 2
guid: 82b2e32f0ef9b394d9bca5387f021527
guid: a96d0bd15faa1c54697d980013967a4f
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
fileFormatVersion: 2
guid: f9aa7eea6019e834098254c662627f70
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 763857f7138f73e48a10e90131a31c5f
ModelImporter:
serializedVersion: 20200
internalIDToNameTable: []
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: palette.003
second: {fileID: 2100000, guid: 5881a75f6ff0f6d48bc43f8d40b87905, type: 2}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1100
meshCompression: 3
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 0
importBlendShapes: 0
importCameras: 0
importLights: 0
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 11
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: cb571e506c1fdb443adfb3ad44825345
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
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: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: palette.003
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: cb571e506c1fdb443adfb3ad44825345, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: cb571e506c1fdb443adfb3ad44825345, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
--- !u!114 &9170570263326417715
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
fileFormatVersion: 2
guid: 5881a75f6ff0f6d48bc43f8d40b87905
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 04f767ebd7eb0cb4c9032a2cf0afe59e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c5e5ee795a89cb94f81259f7517576ad
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
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: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 28c0d2f66ea5ca4468bd34d6b238158d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
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: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: cfe74049c5329374b862f63b9223e0d7
ModelImporter:
serializedVersion: 20200
internalIDToNameTable: []
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: palette
second: {fileID: 2100000, guid: 9a1489e0fd933e04980d89632ae7cdb6, type: 2}
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: palette.001
second: {fileID: 2100000, guid: 92f627233ef7897488d25719f0ed1d44, type: 2}
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: palette.002
second: {fileID: 2100000, guid: 1b355460ac6df5e4992eed6593012266, type: 2}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 3
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 0
importBlendShapes: 0
importCameras: 0
importLights: 0
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 0.01
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 96eeeda548a2459428615ea88d5c7088
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
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: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: palette.001
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: c5e5ee795a89cb94f81259f7517576ad, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: c5e5ee795a89cb94f81259f7517576ad, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
--- !u!114 &4833321176721248357
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
fileFormatVersion: 2
guid: 92f627233ef7897488d25719f0ed1d44
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-6716171652558260160
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: palette.002
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 96eeeda548a2459428615ea88d5c7088, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 96eeeda548a2459428615ea88d5c7088, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
fileFormatVersion: 2
guid: 1b355460ac6df5e4992eed6593012266
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1267933807808326477
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 4
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: palette
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 28c0d2f66ea5ca4468bd34d6b238158d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 28c0d2f66ea5ca4468bd34d6b238158d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
fileFormatVersion: 2
guid: 9a1489e0fd933e04980d89632ae7cdb6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
......@@ -4,8 +4,9 @@
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PolygonParticleFX_Circle
m_Shader: {fileID: 202, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
......@@ -39,7 +40,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 7cc0b541520b0734c80ea6934a192675, type: 3}
m_Texture: {fileID: 2800000, guid: be4939b5da66fb04fa05f577f5f98530, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
......@@ -75,3 +76,4 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
......@@ -4,15 +4,16 @@
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PolygonParticleFX_Default_01
m_Shader: {fileID: 202, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
......@@ -43,7 +44,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: be4939b5da66fb04fa05f577f5f98530, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
......@@ -95,3 +96,4 @@ Material:
- _EmissiveColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 0.659}
m_BuildTextureStacks: []
......@@ -430,7 +430,7 @@ MonoBehaviour:
islandID: -1
damage: 30
health: 50
icon: {fileID: 2800000, guid: b22b17324ba04754392150c857b4db3e, type: 3}
icon: {fileID: 2800000, guid: ae00c4d8955e7fa409decf45d91f9139, type: 3}
canFlight: 0
canFight: 1
- ID: 22
......@@ -438,7 +438,7 @@ MonoBehaviour:
islandID: -1
damage: 30
health: 50
icon: {fileID: 2800000, guid: a5735d46d0555f94c84c0b5f90460505, type: 3}
icon: {fileID: 2800000, guid: b22b17324ba04754392150c857b4db3e, type: 3}
canFlight: 0
canFight: 1
- ID: 23
......@@ -446,7 +446,7 @@ MonoBehaviour:
islandID: -1
damage: 30
health: 50
icon: {fileID: 2800000, guid: 8e8f35b5c7fab434d86198cd52adf8b1, type: 3}
icon: {fileID: 2800000, guid: 3dfa0440b0f417541b539b2a6c89c972, type: 3}
canFlight: 0
canFight: 1
- ID: 24
......@@ -454,7 +454,7 @@ MonoBehaviour:
islandID: -1
damage: 30
health: 50
icon: {fileID: 2800000, guid: a5735d46d0555f94c84c0b5f90460505, type: 3}
icon: {fileID: 2800000, guid: 8e8f35b5c7fab434d86198cd52adf8b1, type: 3}
canFlight: 0
canFight: 1
- ID: 1025
......
......@@ -25,50 +25,62 @@
},
{
"ID": 4,
"Boss": "Chugking",
"Boss": "Ant + Trange",
"Health": 540,
"Damage": 36
},
{
"ID": 5,
"Boss": "NodoSaurus",
"Boss": "Dead + venom",
"Health": 837,
"Damage": 52
},
{
"ID": 6,
"Boss": "Dilophosaurus",
"Boss": "Dead + trage",
"Health": 1339,
"Damage": 75
},
{
"ID": 7,
"Boss": "Brachi",
"Health": 2209,
"Damage": 109
"Boss": "Brachi mecha",
"Health": 40031,
"Damage": 1388
},
{
"ID": 8,
"Boss": "Giganotosaurus",
"Health": 3755,
"Damage": 158
"Boss": "Giga",
"Health": 110322,
"Damage": 1912
},
{
"ID": 9,
"Boss": "Ant + Trange",
"Health": 6571,
"Damage": 229
"Boss": "Fish 3",
"Health": 276903,
"Damage": 3199
},
{
"ID": 10,
"Boss": "Dead + venom",
"Health": 11828,
"Damage": 332
"Boss": "Pterodactyl",
"Health": 464889,
"Damage": 4297
},
{
"ID": 11,
"Boss": "Dead + trage",
"Health": 22473,
"Damage": 481
"Boss": "Styracosaurus",
"Health": 697334,
"Damage": 5156
},
{
"ID": 12,
"Boss": "Huayangosaurus",
"Health": 1046001,
"Damage": 6187
},
{
"ID": 13,
"Boss": "Carntauraurus",
"Health": 1569002,
"Damage": 7424
}
]
\ No newline at end of file
[
[
{
"ID": 0,
"Name": "Captain",
......@@ -119,6 +119,86 @@
"Lv3": 72,
"Increase": 15
},
{
"ID": 15,
"Name": "Vision",
"Lv1": 20,
"Lv2": 50,
"Lv3": 75,
"Increase": 15
},
{
"ID": 16,
"Name": "Loki",
"Lv1": 21,
"Lv2": 53,
"Lv3": 80,
"Increase": 15
},
{
"ID": 17,
"Name": "Hawkeye",
"Lv1": 22,
"Lv2": 55,
"Lv3": 83,
"Increase": 15
},
{
"ID": 18,
"Name": "The flash",
"Lv1": 23,
"Lv2": 58,
"Lv3": 87,
"Increase": 15
},
{
"ID": 19,
"Name": "Chiến binh mùa đông",
"Lv1": 24,
"Lv2": 60,
"Lv3": 90,
"Increase": 15
},
{
"ID": 20,
"Name": "Aquaman",
"Lv1": 25,
"Lv2": 63,
"Lv3": 95,
"Increase": 15
},
{
"ID": 21,
"Name": "Black Widow",
"Lv1": 26,
"Lv2": 65,
"Lv3": 98,
"Increase": 15
},
{
"ID": 22,
"Name": "Scarlet Witch",
"Lv1": 27,
"Lv2": 68,
"Lv3": 102,
"Increase": 15
},
{
"ID": 23,
"Name": "Joker",
"Lv1": 28,
"Lv2": 70,
"Lv3": 105,
"Increase": 15
},
{
"ID": 24,
"Name": "Ghost Rider",
"Lv1": 29,
"Lv2": 73,
"Lv3": 110,
"Increase": 15
},
{
"ID": 1000,
"Name": "Cap + Spider",
......@@ -318,5 +398,125 @@
"Lv2": 110,
"Lv3": 165,
"Increase": 15
},
{
"ID": 1025,
"Name": "Vision + Loki",
"Lv1": 45,
"Lv2": 113,
"Lv3": 170,
"Increase": 15
},
{
"ID": 1026,
"Name": "Vision + Hawkeye",
"Lv1": 46,
"Lv2": 115,
"Lv3": 173,
"Increase": 15
},
{
"ID": 1027,
"Name": "Vision + The flassh",
"Lv1": 47,
"Lv2": 118,
"Lv3": 177,
"Increase": 15
},
{
"ID": 1028,
"Name": "Loki + BlackWidow",
"Lv1": 48,
"Lv2": 120,
"Lv3": 180,
"Increase": 15
},
{
"ID": 1029,
"Name": "Loki + Winter Soilder",
"Lv1": 49,
"Lv2": 123,
"Lv3": 185,
"Increase": 15
},
{
"ID": 1030,
"Name": "Hawkeye + Scarlet",
"Lv1": 50,
"Lv2": 125,
"Lv3": 188,
"Increase": 15
},
{
"ID": 1031,
"Name": "Hawkeye + Aquâmn",
"Lv1": 51,
"Lv2": 128,
"Lv3": 192,
"Increase": 15
},
{
"ID": 1032,
"Name": "The flash + Winter Soilder",
"Lv1": 52,
"Lv2": 130,
"Lv3": 195,
"Increase": 15
},
{
"ID": 1033,
"Name": "The flash + Joker",
"Lv1": 53,
"Lv2": 133,
"Lv3": 200,
"Increase": 15
},
{
"ID": 1034,
"Name": "Winter Soilder + Ghost Rider",
"Lv1": 54,
"Lv2": 135,
"Lv3": 203,
"Increase": 15
},
{
"ID": 1035,
"Name": "Aquaaman + Joker",
"Lv1": 55,
"Lv2": 138,
"Lv3": 207,
"Increase": 15
},
{
"ID": 1036,
"Name": "Aquaman + BlackWidow",
"Lv1": 56,
"Lv2": 140,
"Lv3": 210,
"Increase": 15
},
{
"ID": 1037,
"Name": "Black Widow + Scarlet",
"Lv1": 57,
"Lv2": 143,
"Lv3": 215,
"Increase": 15
},
{
"ID": 1038,
"Name": "Scarlet + Ghost Rider",
"Lv1": 58,
"Lv2": 145,
"Lv3": 218,
"Increase": 15
},
{
"ID": 1039,
"Name": "Jorker + Ghost Rider",
"Lv1": 59,
"Lv2": 148,
"Lv3": 222,
"Increase": 15
}
]
\ No newline at end of file
......@@ -57,7 +57,7 @@ SpriteAtlas:
packables:
- {fileID: 102900000, guid: 4e335dd69ae1a134aa0a5f56668070b1, type: 3}
- {fileID: 102900000, guid: 699006b321fc45b41830d7d4b7dc876b, type: 3}
totalSpriteSurfaceArea: 26035428
totalSpriteSurfaceArea: 22627556
bindAsDefault: 1
isAtlasV2: 0
cachedData: {fileID: 0}
......@@ -66,6 +66,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: 33867020d343b8e4cb14bbebe75332d0, type: 3}
- {fileID: 21300000, guid: 4747e920b062ea64da91ac25e8f4f0cd, type: 3}
- {fileID: 21300000, guid: 8c594e30c8216b84daa01ab26bf22890, type: 3}
- {fileID: 21300000, guid: fba38660e852844489a398f9b23f7d7d, type: 3}
- {fileID: 21300000, guid: 17f8c17046321134a9395fd4cd82ae4f, type: 3}
- {fileID: 21300000, guid: 54ad13a0a78399147bda5a214239ceef, type: 3}
- {fileID: 21300000, guid: 993e7ba0ef835ab4aa6b6b1cc737a47c, type: 3}
......@@ -74,13 +75,13 @@ SpriteAtlas:
- {fileID: 21300000, guid: 1f4a500103f0b1549a3eff55137217b2, type: 3}
- {fileID: 21300000, guid: eeb041213806f6e4f88a00b04d98682b, type: 3}
- {fileID: 21300000, guid: c8c16751aa4fd1140ac94999bb0a383f, type: 3}
- {fileID: 21300000, guid: 3c657661bfcf3314c9db863ee74f4129, type: 3}
- {fileID: 21300000, guid: d63f376179fff8745b586364a0cffe4f, type: 3}
- {fileID: 21300000, guid: 25130281581629a439d2401e404c28ea, type: 3}
- {fileID: 21300000, guid: e3e49d91f2f08694ab4c0f0c52828dd4, type: 3}
- {fileID: 21300000, guid: 21a0a14243985ee4bb2df2840731825d, type: 3}
- {fileID: 21300000, guid: 468c92622997bce47a765d59254db6f0, type: 3}
- {fileID: 21300000, guid: bf8d21a27ed3a0c4795fc3792562bb3a, type: 3}
- {fileID: 21300000, guid: 4bc0f2d285791104596e5ae78424aa6d, type: 3}
- {fileID: 21300000, guid: 4eebcc2371a7f2647b7fad69ee59dc54, type: 3}
- {fileID: 21300000, guid: 9f8439437e977a9498a0c945b3ffae57, type: 3}
- {fileID: 21300000, guid: 24e96b43e26999f488694a7f0af3cfa4, type: 3}
......@@ -152,6 +153,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: aa8828ab0f5457448932ade4ceb240e2, type: 3}
- {fileID: 21300000, guid: 8fa9edcb0771fd842b0cdf77269e6a25, type: 3}
- {fileID: 21300000, guid: d230dfcb34aae6140bf79e592c52accb, type: 3}
- {fileID: 21300000, guid: 5b0177dbdbad2ef459c516350531b75f, type: 3}
- {fileID: 21300000, guid: d9f578eb49319594ab988bb78b69c522, type: 3}
- {fileID: 21300000, guid: 24173dfb9d105d848bf02b1938316f8b, type: 3}
- {fileID: 21300000, guid: 212dea2cf17ec4e4385df6173f61183f, type: 3}
......@@ -194,6 +196,7 @@ SpriteAtlas:
- Shape 1
- 2-06
- 1-02-13
- iocn fruit
- button_skins_unselected
- Shape 2 copy (2)
- Layer 7 copy 3
......@@ -202,13 +205,13 @@ SpriteAtlas:
- 3-17
- 4-17
- "d\u01B0a chu\u1ED9t-13"
- Outline_sell
- ic10-16
- BG #19256
- Group 3 (merged)
- Layer 45
- Layer 39
- show shop-07
- "t\xE2m"
- Group 3 (merged)
- 1-05
- Layer 61
......@@ -280,6 +283,7 @@ SpriteAtlas:
- Layer 10
- 8-12
- Layer 11
- Outline
- Shape 3
- 6-10
- Layer 51
......
fileFormatVersion: 2
guid: b22b17324ba04754392150c857b4db3e
guid: ae00c4d8955e7fa409decf45d91f9139
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
......
fileFormatVersion: 2
guid: b22b17324ba04754392150c857b4db3e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 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
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
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
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
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 3dfa0440b0f417541b539b2a6c89c972
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 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
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
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
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
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 8e8f35b5c7fab434d86198cd52adf8b1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 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
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
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
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
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
......@@ -23,13 +23,9 @@ MonoBehaviour:
m_RequireOpaqueTexture: 0
m_OpaqueDownsampling: 1
m_SupportsTerrainHoles: 1
m_StoreActionsOptimization: 0
m_SupportsHDR: 0
m_MSAA: 1
m_RenderScale: 1
m_UpscalingFilter: 0
m_FsrOverrideSharpness: 0
m_FsrSharpness: 0.92
m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 1
m_MainLightShadowmapResolution: 2048
......@@ -37,38 +33,25 @@ MonoBehaviour:
m_AdditionalLightsPerObjectLimit: 4
m_AdditionalLightShadowsSupported: 0
m_AdditionalLightsShadowmapResolution: 512
m_AdditionalLightsShadowResolutionTierLow: 128
m_AdditionalLightsShadowResolutionTierMedium: 256
m_AdditionalLightsShadowResolutionTierHigh: 512
m_ReflectionProbeBlending: 0
m_ReflectionProbeBoxProjection: 0
m_ShadowDistance: 50
m_ShadowCascadeCount: 1
m_Cascade2Split: 0.25
m_Cascade3Split: {x: 0.1, y: 0.3}
m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
m_CascadeBorder: 0.1
m_ShadowDepthBias: 1
m_ShadowNormalBias: 1
m_SoftShadowsSupported: 0
m_ConservativeEnclosingSphere: 0
m_NumIterationsEnclosingSphere: 64
m_AdditionalLightsCookieResolution: 2048
m_AdditionalLightsCookieFormat: 3
m_UseSRPBatcher: 1
m_SupportsDynamicBatching: 0
m_SupportsDynamicBatching: 1
m_MixedLightingSupported: 1
m_SupportsLightLayers: 0
m_DebugLevel: 0
m_UseAdaptivePerformance: 1
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
m_UseFastSRGBLinearConversion: 0
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256
m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256
m_ShaderVariantLogLevel: 0
m_VolumeFrameworkUpdateMode: 0
m_ShadowCascades: 0
......@@ -23,13 +23,9 @@ MonoBehaviour:
m_RequireOpaqueTexture: 0
m_OpaqueDownsampling: 1
m_SupportsTerrainHoles: 1
m_StoreActionsOptimization: 0
m_SupportsHDR: 0
m_MSAA: 1
m_RenderScale: 1
m_UpscalingFilter: 0
m_FsrOverrideSharpness: 0
m_FsrSharpness: 0.92
m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 0
m_MainLightShadowmapResolution: 2048
......@@ -37,38 +33,25 @@ MonoBehaviour:
m_AdditionalLightsPerObjectLimit: 4
m_AdditionalLightShadowsSupported: 0
m_AdditionalLightsShadowmapResolution: 512
m_AdditionalLightsShadowResolutionTierLow: 128
m_AdditionalLightsShadowResolutionTierMedium: 256
m_AdditionalLightsShadowResolutionTierHigh: 512
m_ReflectionProbeBlending: 0
m_ReflectionProbeBoxProjection: 0
m_ShadowDistance: 50
m_ShadowCascadeCount: 1
m_Cascade2Split: 0.25
m_Cascade3Split: {x: 0.1, y: 0.3}
m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
m_CascadeBorder: 0.1
m_ShadowDepthBias: 1
m_ShadowNormalBias: 1
m_SoftShadowsSupported: 0
m_ConservativeEnclosingSphere: 0
m_NumIterationsEnclosingSphere: 64
m_AdditionalLightsCookieResolution: 2048
m_AdditionalLightsCookieFormat: 3
m_UseSRPBatcher: 1
m_SupportsDynamicBatching: 0
m_SupportsDynamicBatching: 1
m_MixedLightingSupported: 1
m_SupportsLightLayers: 0
m_DebugLevel: 0
m_UseAdaptivePerformance: 1
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
m_UseFastSRGBLinearConversion: 0
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256
m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256
m_ShaderVariantLogLevel: 0
m_VolumeFrameworkUpdateMode: 0
m_ShadowCascades: 0
......@@ -23,13 +23,9 @@ MonoBehaviour:
m_RequireOpaqueTexture: 0
m_OpaqueDownsampling: 1
m_SupportsTerrainHoles: 1
m_StoreActionsOptimization: 0
m_SupportsHDR: 0
m_MSAA: 1
m_RenderScale: 1
m_UpscalingFilter: 0
m_FsrOverrideSharpness: 0
m_FsrSharpness: 0.92
m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 1
m_MainLightShadowmapResolution: 1024
......@@ -37,38 +33,25 @@ MonoBehaviour:
m_AdditionalLightsPerObjectLimit: 4
m_AdditionalLightShadowsSupported: 0
m_AdditionalLightsShadowmapResolution: 512
m_AdditionalLightsShadowResolutionTierLow: 128
m_AdditionalLightsShadowResolutionTierMedium: 256
m_AdditionalLightsShadowResolutionTierHigh: 512
m_ReflectionProbeBlending: 0
m_ReflectionProbeBoxProjection: 0
m_ShadowDistance: 30
m_ShadowCascadeCount: 1
m_Cascade2Split: 0.25
m_Cascade3Split: {x: 0.1, y: 0.3}
m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
m_CascadeBorder: 0.1
m_ShadowDepthBias: 1
m_ShadowNormalBias: 1
m_SoftShadowsSupported: 0
m_ConservativeEnclosingSphere: 0
m_NumIterationsEnclosingSphere: 64
m_AdditionalLightsCookieResolution: 2048
m_AdditionalLightsCookieFormat: 3
m_UseSRPBatcher: 1
m_SupportsDynamicBatching: 0
m_SupportsDynamicBatching: 1
m_MixedLightingSupported: 1
m_SupportsLightLayers: 0
m_DebugLevel: 0
m_UseAdaptivePerformance: 1
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
m_UseFastSRGBLinearConversion: 0
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256
m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256
m_ShaderVariantLogLevel: 0
m_VolumeFrameworkUpdateMode: 0
m_ShadowCascades: 0
This diff is collapsed.
......@@ -1036,8 +1036,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
useMax: 1
testAds: 1
dontShowForTest: 1
testAds: 0
dontShowForTest: 0
bannerIDs:
- ca-app-pub-2108281678096461/7587922771
- ca-app-pub-2108281678096461/7587922771
......@@ -1564,6 +1564,18 @@ PrefabInstance:
propertyPath: assetHalloween
value:
objectReference: {fileID: 11400000, guid: a7b9e25e3f30c974984ec8bf3baf11b8, type: 2}
- target: {fileID: 2043867484057042370, guid: d31c9ddce37c99e4c90f6e4f469a0e4c, type: 3}
propertyPath: islandPrices.Array.size
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2043867484057042370, guid: d31c9ddce37c99e4c90f6e4f469a0e4c, type: 3}
propertyPath: islandPrices.Array.data[3]
value: 5000
objectReference: {fileID: 0}
- target: {fileID: 2043867484057042370, guid: d31c9ddce37c99e4c90f6e4f469a0e4c, type: 3}
propertyPath: islandPrices.Array.data[4]
value: 7500
objectReference: {fileID: 0}
- target: {fileID: 2043867484057042371, guid: d31c9ddce37c99e4c90f6e4f469a0e4c, type: 3}
propertyPath: m_RootOrder
value: 4
......
......@@ -317,7 +317,7 @@ public class AdsController : MonoBehaviour, OnMaxCallBackListener
public void HandleInterAdPaidEvent(object sender, AdValueEventArgs args)
{
}
public bool ShowInter(Action callback, bool isClickBtn = false)
public bool ShowInter(Action callback, bool isClickBtn = false, bool ignoreTime = false)
{
if (dontShowForTest)
{
......@@ -329,7 +329,7 @@ public class AdsController : MonoBehaviour, OnMaxCallBackListener
callback?.Invoke();
return true;
}
if (DataManager.Instance.userData.removeAds || timeShowInterValue > 0f)
if (DataManager.Instance.userData.removeAds || (timeShowInterValue > 0f && !ignoreTime))
{
callback?.Invoke();
return true;
......
......@@ -26,7 +26,7 @@ public class DinosaurBehavior : MonoBehaviour
public int damage = 0;
public bool isDead = false;
protected Animator animator;
protected SkinnedMeshRenderer skinnedMesh;
//protected SkinnedMeshRenderer skinnedMesh;
protected Material material;
public DinosaurBehavior currentTarget;
public AttackPosition atkPos;
......@@ -43,6 +43,8 @@ public class DinosaurBehavior : MonoBehaviour
protected List<ParticleSystem> effects;
public Color[] upgradeColors;
public int level;
protected SkinnedMeshRenderer[] skinnedMesh;
// Start is called before the first frame update
void Awake()
{
......@@ -50,8 +52,8 @@ public class DinosaurBehavior : MonoBehaviour
attackCollider = GetComponentInChildren<AttackCollider>(true);
if (attackCollider) attackCollider.dino = this;
animator = GetComponent<Animator>();
skinnedMesh = GetComponentInChildren<SkinnedMeshRenderer>();
material = skinnedMesh.sharedMaterial;
//skinnedMesh = GetComponentInChildren<SkinnedMeshRenderer>();
//material = skinnedMesh.sharedMaterial;
healthBar = GetComponentInChildren<HealthBar>(true);
if (healthBar) healthBar.gameObject.SetActive(false);
......@@ -63,8 +65,43 @@ public class DinosaurBehavior : MonoBehaviour
effect.gameObject.SetActive(false);
effects.Add(effect);
}
}
skinnedMesh = GetComponentsInChildren<SkinnedMeshRenderer>();
}
private void OnEnable()
{
Flash(false);
}
private void OnDisable()
{
Flash(false);
}
private void Flash(bool damage)
{
if (damage)
{
foreach (SkinnedMeshRenderer skin in skinnedMesh)
{
for (int i = 0; i < skin.materials.Length; i++)
{
skin.materials[i].EnableKeyword("_EMISSION");
skin.materials[i].SetVector("_EmissionColor", Color.white * 1);
}
}
}
else
{
foreach (SkinnedMeshRenderer skin in skinnedMesh)
{
for (int i = 0; i < skin.materials.Length; i++)
{
skin.materials[i].DisableKeyword("_EMISSION");
skin.materials[i].globalIlluminationFlags = MaterialGlobalIlluminationFlags.EmissiveIsBlack;
skin.materials[i].SetColor("_EmissionColor", Color.black);
}
}
}
}
public void ChangeEffect(int level)
{
this.level = level;
......@@ -211,12 +248,17 @@ public class DinosaurBehavior : MonoBehaviour
IEnumerator DamageEffect()
{
effectDaming = true;
material.EnableKeyword("_EMISSION");
material.SetVector("_EmissionColor", Color.white * 1);
yield return new WaitForSeconds(0.03f);
material.DisableKeyword("_EMISSION");
material.globalIlluminationFlags = MaterialGlobalIlluminationFlags.EmissiveIsBlack;
material.SetColor("_EmissionColor", Color.black);
Flash(true);
yield return new WaitForSeconds(0.05f);
Flash(false);
yield return new WaitForSeconds(0.05f);
Flash(true);
yield return new WaitForSeconds(0.05f);
Flash(false);
yield return new WaitForSeconds(0.05f);
effectDaming = false;
}
......
......@@ -12,13 +12,39 @@ public class UnlockSlotPanel : MonoBehaviour
public UIButton unlock;
public UIButton freeUnlock;
public UIButton close;
public TextMeshProUGUI title;
public TextMeshProUGUI getCoinTitle;
public TextMeshProUGUI randCoinText;
public Action<FightSlotInfo> unlockCallback;
public Action onClose;
private int price = 200;
private int totalPrice = 200;
private int randCoin = 200;
private void OnEnable()
{
unlock.gameObject.SetActive(DataManager.Instance.userData.coin >= price);
freeUnlock.gameObject.SetActive(!(DataManager.Instance.userData.coin >= price));
totalPrice = price * (DataManager.Instance.userData.GetUnlockFightSlotCount() - 1);
unlock.gameObject.SetActive(DataManager.Instance.userData.coin >= totalPrice);
freeUnlock.gameObject.SetActive(!(DataManager.Instance.userData.coin >= totalPrice));
title.gameObject.SetActive(DataManager.Instance.userData.coin >= totalPrice);
getCoinTitle.gameObject.SetActive(!(DataManager.Instance.userData.coin >= totalPrice));
if (!(DataManager.Instance.userData.coin >= totalPrice))
{
getCoinTitle.text = string.Format("Need <color=red>{0} <sprite=0></color> to unlock!", totalPrice);
randCoin = UnityEngine.Random.Range(200, 500);
randCoinText.text = string.Format("{0} <sprite=0>", randCoin);
}
else
{
priceTxt.text = string.Format("{0} <sprite=0>", totalPrice);
}
}
public void SetUnlockCallback(Action<FightSlotInfo> callback, Action onClose)
{
......@@ -28,10 +54,10 @@ public class UnlockSlotPanel : MonoBehaviour
public void OnUnlock()
{
if(DataManager.Instance.userData.coin >= price)
if(DataManager.Instance.userData.coin >= totalPrice)
{
FirebaseManager.Instance.PushUnlockStandEvent();
DataManager.Instance.AddCoin(-price);
DataManager.Instance.AddCoin(-totalPrice);
unlockCallback?.Invoke(currentSlot);
OnClose();
}
......@@ -46,6 +72,15 @@ public class UnlockSlotPanel : MonoBehaviour
}
}
public void OnClick_GetCoin()
{
AdsController.instance.ShowReward(() =>
{
DataManager.Instance.AddCoin(randCoin);
OnClose();
});
}
public void OnClose()
{
onClose?.Invoke();
......
......@@ -159,13 +159,13 @@ public class Gp_landAnimal : DinosaurBehavior
public void SetColor(bool isShadow = true)
{
if (isShadow)
{
skinnedMesh.material.color = new Color(0f, 0f, 0f, 0f);
}
else
{
skinnedMesh.material.color = new Color(1f, 1f, 1f, 1f);
}
//if (isShadow)
//{
// skinnedMesh.material.color = new Color(0f, 0f, 0f, 0f);
//}
//else
//{
// skinnedMesh.material.color = new Color(1f, 1f, 1f, 1f);
//}
}
}
......@@ -49,7 +49,7 @@ namespace Negaxy.UI
DataManager.Instance.AddCoin(totalCoin);
DataManager.Instance.NextLevel();
LoadNewLevel();
});
}, ignoreTime: true);
FirebaseManager.Instance.PushBtnNothanksEvent();
}
else
......
......@@ -265,9 +265,9 @@ public class MergeScreen : MonoBehaviour
}
else
{
mergeCoinText.text = "<sprite=0> 200";
mergeCoinText.gameObject.SetActive(DataManager.Instance.userData.coin >= 200);
mergeVideoText.gameObject.SetActive(!(DataManager.Instance.userData.coin >= 200));
mergeCoinText.text = "<sprite=0> 400";
mergeCoinText.gameObject.SetActive(DataManager.Instance.userData.coin >= 400);
mergeVideoText.gameObject.SetActive(!(DataManager.Instance.userData.coin >= 400));
}
}
......@@ -307,10 +307,10 @@ public class MergeScreen : MonoBehaviour
}
public void OnClick_Merge()
{
if (DataManager.Instance.userData.coin >= 200 || DataManager.Instance.userData.hasTut)
if (DataManager.Instance.userData.coin >= 400 || DataManager.Instance.userData.hasTut)
{
mergeCount += 1;
DataManager.Instance.AddCoin(DataManager.Instance.userData.hasTut ? 0 : -200);
DataManager.Instance.AddCoin(DataManager.Instance.userData.hasTut ? 0 : -400);
StartCoroutine(ie_Merge());
GuiManager.Instance.tutorialScreen.TryNextTut();
}
......
......@@ -36,6 +36,7 @@ public class DataManager : Singleton<DataManager>
// Check user cu
base.OnAwake();
assetManager = assetHalloween;
LoadUserData();
LoadMergeData();
if (cheat)
......@@ -43,10 +44,10 @@ public class DataManager : Singleton<DataManager>
Cheat();
}
}
private void Start()
{
SetThemeHalloween();
}
//private void Start()
//{
// SetThemeHalloween();
//}
private void SetThemeHalloween()
{
if (FirebaseManager.Instance.useThemeHalloween)
......@@ -380,6 +381,19 @@ public class DataManager : Singleton<DataManager>
public List<int> unlockedHandIds = new List<int>();
public List<int> unlockedWeaponIds = new List<int>();
public int[] unlockFightSlot = new int[12];
public int GetUnlockFightSlotCount()
{
int res = 0;
for(int i=0; i<unlockFightSlot.Length; i++)
{
if( unlockFightSlot[i] == 1)
{
res += 1;
}
}
return res;
}
public void Init()
{
if (unlockedIslands.Count == 0)
......
......@@ -87,7 +87,7 @@ PlayerSettings:
resizableWindow: 0
useMacAppStoreValidation: 0
macAppStoreCategory: public.app-category.games
gpuSkinning: 1
gpuSkinning: 0
xboxPIXTextureCapture: 0
xboxEnableAvatar: 0
xboxEnableKinect: 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment