diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_tirl_147_01_02_tga.tga.meta b/Assets/ManagedResources/Atlas/ArenaAtlas/j_jingjichang_qianzhan_paimin.png.meta similarity index 86% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_tirl_147_01_02_tga.tga.meta rename to Assets/ManagedResources/Atlas/ArenaAtlas/j_jingjichang_qianzhan_paimin.png.meta index 04f1be284c..617cb9dfac 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_tirl_147_01_02_tga.tga.meta +++ b/Assets/ManagedResources/Atlas/ArenaAtlas/j_jingjichang_qianzhan_paimin.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 4ef642b00f55ee94590e1dcd5710571f +guid: 441198582ade1e140940dedfa58a5c40 TextureImporter: fileIDToRecycleName: {} externalObjects: {} serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -31,16 +31,16 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -75,12 +75,12 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 453d045a138825047baa481d53c55988 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + spritePackingTag: ArenaAtlas pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_zhezhao_50.tga.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ChiZhaFengYun/r_zjm_huodongicon-chichafenyun.png.meta similarity index 85% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_zhezhao_50.tga.meta rename to Assets/ManagedResources/Atlas/DynamicActivityAtlas/ChiZhaFengYun/r_zjm_huodongicon-chichafenyun.png.meta index e334b58fb3..31429beaad 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_zhezhao_50.tga.meta +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ChiZhaFengYun/r_zjm_huodongicon-chichafenyun.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 005392e242e167047bfaa53a7bd30c44 +guid: b2b4a22a94829974f88088fe13d07f9f TextureImporter: fileIDToRecycleName: {} externalObjects: {} serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -27,20 +27,20 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -75,12 +75,12 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: d64d804f35f5dd94db8d6155e311aad4 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + spritePackingTag: DynamicActivityAtlas pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_tirl_147_01_02.tga.meta b/Assets/ManagedResources/Atlas/VipAtlas/ArtFont/t_tequan_xiaoyao.png.meta similarity index 86% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_tirl_147_01_02.tga.meta rename to Assets/ManagedResources/Atlas/VipAtlas/ArtFont/t_tequan_xiaoyao.png.meta index fa62a9a664..8f7c8b2cbb 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_tirl_147_01_02.tga.meta +++ b/Assets/ManagedResources/Atlas/VipAtlas/ArtFont/t_tequan_xiaoyao.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 923855231d98c054488513d353e69ca3 +guid: bc597f9d52d4fa0499601cd2210d6ad0 TextureImporter: fileIDToRecycleName: {} externalObjects: {} serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -31,16 +31,16 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -75,12 +75,12 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 7269c09ca09a85b46b2d4df149b50414 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + spritePackingTag: VipAtlas pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI.meta b/Assets/ManagedResources/EffectResSkill.meta similarity index 77% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI.meta rename to Assets/ManagedResources/EffectResSkill.meta index c35a8a253f..3616ed06e8 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI.meta +++ b/Assets/ManagedResources/EffectResSkill.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 76d90ce45026b3c45928728309c9c5e2 +guid: 40b858c1a077bdb4285561802ae31d2c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Materials/AoBing_MZ_32.mat.meta b/Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Materials/AoBing_MZ_32.mat.meta index ca40236e51..b03237f3e9 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Materials/AoBing_MZ_32.mat.meta +++ b/Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Materials/AoBing_MZ_32.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b9acb216cdb910941b49a4cb4d971d62 +guid: 4023bdae83bf9bc448bb9554a9f29f21 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Materials/shuizhu_04.mat.meta b/Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Materials/shuizhu_04.mat.meta index 74176e8277..3992e19f37 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Materials/shuizhu_04.mat.meta +++ b/Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Materials/shuizhu_04.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e269e6ba14118fa49bc5ce46cd681e2d +guid: 1d1209fc79d92954b84779ba6cba92a3 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Materials/shuizhu_03.mat.meta b/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Materials/shuizhu_03.mat.meta index bd3142b7ed..05abf49418 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Materials/shuizhu_03.mat.meta +++ b/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Materials/shuizhu_03.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d009c6e0e34f7304990e3bb2d96876f3 +guid: 2387da7f49399274d9cb46984b3ba554 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Model/ShiZiPian_new.FBX.meta b/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Model/ShiZiPian_new.FBX.meta index 51e4831bb2..4bc3faddd5 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Model/ShiZiPian_new.FBX.meta +++ b/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Model/ShiZiPian_new.FBX.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 94c84d058668109478b16faa3ab622ab +guid: d093aef79fad1554a93acc5337753069 ModelImporter: serializedVersion: 23 fileIDToRecycleName: diff --git a/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Texture/H_zhezhao_50.tga.meta b/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Texture/H_zhezhao_50.tga.meta index 642bf4b613..869f81074e 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Texture/H_zhezhao_50.tga.meta +++ b/Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Texture/H_zhezhao_50.tga.meta @@ -1,88 +1,56 @@ fileFormatVersion: 2 -guid: 5f66bf900b79d1a49ad5682831ecaeff +guid: 0250331175fd0004881c434a4ea098e5 +timeCreated: 1561594651 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: - serializedVersion: 2 sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Texture/H_tirl_147_01_02.tga.meta b/Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Texture/H_tirl_147_01_02.tga.meta index ba4b1250aa..f527140121 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Texture/H_tirl_147_01_02.tga.meta +++ b/Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Texture/H_tirl_147_01_02.tga.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d1ab11fb367af6640b43efc4ecb45eb9 +guid: 71bf99737ef01f14a97f2ff674324001 TextureImporter: fileIDToRecycleName: {} externalObjects: {} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_03_mat.mat.meta b/Assets/ManagedResources/EffectResUI/MonsterCasting.meta similarity index 52% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_03_mat.mat.meta rename to Assets/ManagedResources/EffectResUI/MonsterCasting.meta index e0c412618a..1842fdf115 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_03_mat.mat.meta +++ b/Assets/ManagedResources/EffectResUI/MonsterCasting.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 15af42296a877cb4ba902763c320d2d6 -NativeFormatImporter: +guid: 8cb5f9c943c26814e9da98e7680afc1b +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_04.mat.meta b/Assets/ManagedResources/EffectResUI/MonsterCasting/Prefab.meta similarity index 52% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_04.mat.meta rename to Assets/ManagedResources/EffectResUI/MonsterCasting/Prefab.meta index 559c6b4514..4adf21cb86 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_04.mat.meta +++ b/Assets/ManagedResources/EffectResUI/MonsterCasting/Prefab.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 334d10ba08ecb4a4dbf9a053d31b6d5e -NativeFormatImporter: +guid: 8a6f620a94d6d9144bf4b487025c4b34 +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResUI/PokemonEgg/Animation/Effect_Dan_changzhu_001_controller.controller b/Assets/ManagedResources/EffectResUI/PokemonEgg/Animation/Effect_Dan_changzhu_001_controller.controller new file mode 100644 index 0000000000..0476968ff5 --- /dev/null +++ b/Assets/ManagedResources/EffectResUI/PokemonEgg/Animation/Effect_Dan_changzhu_001_controller.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Effect_Dan_changzhu_001_controller + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107376487281147702} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102525200353734140 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Effect_Dan_posui_001 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 76bc4e27bd5930a4f92bcb1019b928f4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107376487281147702 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102525200353734140} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102525200353734140} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_03.mat.meta b/Assets/ManagedResources/EffectResUI/PokemonEgg/Animation/Effect_Dan_changzhu_001_controller.controller.meta similarity index 64% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_03.mat.meta rename to Assets/ManagedResources/EffectResUI/PokemonEgg/Animation/Effect_Dan_changzhu_001_controller.controller.meta index 85d3928975..e58420a8fd 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_03.mat.meta +++ b/Assets/ManagedResources/EffectResUI/PokemonEgg/Animation/Effect_Dan_changzhu_001_controller.controller.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 242b26e7150aa8e428680c6518db1df7 +guid: 7ce5b94dfb39ad94ca0dcb69c53aa5c7 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 2100000 + mainObjectFileID: 9100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResUI/PokemonEgg/Animation/Effect_Dan_posui_001_controller.controller b/Assets/ManagedResources/EffectResUI/PokemonEgg/Animation/Effect_Dan_posui_001_controller.controller new file mode 100644 index 0000000000..86d408fbfa --- /dev/null +++ b/Assets/ManagedResources/EffectResUI/PokemonEgg/Animation/Effect_Dan_posui_001_controller.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Effect_Dan_posui_001_controller + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107889714520812684} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102996975812828254 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Effect_Dan_changzhu_001 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: c5897e62c7999424a88ee9b738b22fe6, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107889714520812684 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102996975812828254} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102996975812828254} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/AoBing_MZ_32.mat.meta b/Assets/ManagedResources/EffectResUI/PokemonEgg/Animation/Effect_Dan_posui_001_controller.controller.meta similarity index 64% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/AoBing_MZ_32.mat.meta rename to Assets/ManagedResources/EffectResUI/PokemonEgg/Animation/Effect_Dan_posui_001_controller.controller.meta index b03237f3e9..a65891c3cb 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/AoBing_MZ_32.mat.meta +++ b/Assets/ManagedResources/EffectResUI/PokemonEgg/Animation/Effect_Dan_posui_001_controller.controller.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 4023bdae83bf9bc448bb9554a9f29f21 +guid: 9d15621770fe02e4da78a4a9442a82a2 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 2100000 + mainObjectFileID: 9100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResUI/PokemonEgg/Materials/Effect_Dan_posui_001_mat.mat b/Assets/ManagedResources/EffectResUI/PokemonEgg/Materials/Effect_Dan_posui_001_mat.mat new file mode 100644 index 0000000000..ecbdca58e1 --- /dev/null +++ b/Assets/ManagedResources/EffectResUI/PokemonEgg/Materials/Effect_Dan_posui_001_mat.mat @@ -0,0 +1,29 @@ +%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: Effect_Dan_posui_001_mat + m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: e49c2b70278ead7439d678b93279b6e6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _InvFade: 1 + m_Colors: + - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/EffectResUI/PokemonEgg/Materials/Effect_Dan_posui_001_mat.mat.meta b/Assets/ManagedResources/EffectResUI/PokemonEgg/Materials/Effect_Dan_posui_001_mat.mat.meta new file mode 100644 index 0000000000..3954579617 --- /dev/null +++ b/Assets/ManagedResources/EffectResUI/PokemonEgg/Materials/Effect_Dan_posui_001_mat.mat.meta @@ -0,0 +1,6 @@ +fileFormatVersion: 2 +guid: 3c1dbecfb148e044b9d6619c8725942b +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Model.meta b/Assets/ManagedResources/EffectResUI/PokemonEgg/Model.meta similarity index 77% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Model.meta rename to Assets/ManagedResources/EffectResUI/PokemonEgg/Model.meta index 1e374621ab..f8f206f689 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Model.meta +++ b/Assets/ManagedResources/EffectResUI/PokemonEgg/Model.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5713f0f7af57019469bf5dd65e5fd014 +guid: a98685584d55c484a8f3496ed7a6ccda folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/EffectResUI/PokemonEgg/Model/tiangong_01.FBX b/Assets/ManagedResources/EffectResUI/PokemonEgg/Model/tiangong_01.FBX new file mode 100644 index 0000000000..d4504603c3 Binary files /dev/null and b/Assets/ManagedResources/EffectResUI/PokemonEgg/Model/tiangong_01.FBX differ diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Model/ShiZiPian_new.FBX.meta b/Assets/ManagedResources/EffectResUI/PokemonEgg/Model/tiangong_01.FBX.meta similarity index 89% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Model/ShiZiPian_new.FBX.meta rename to Assets/ManagedResources/EffectResUI/PokemonEgg/Model/tiangong_01.FBX.meta index cf4946da2c..7d66cb7d21 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Model/ShiZiPian_new.FBX.meta +++ b/Assets/ManagedResources/EffectResUI/PokemonEgg/Model/tiangong_01.FBX.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8adb7d31e2364fa4392c4239556c10b3 +guid: 534df1946079cbf47ba0a9ee8f76189a ModelImporter: serializedVersion: 23 fileIDToRecycleName: @@ -7,13 +7,13 @@ ModelImporter: 400000: //RootNode 2300000: //RootNode 3300000: //RootNode - 4300000: ShiZiPian_new + 4300000: Plane002 externalObjects: {} materials: importMaterials: 0 materialName: 0 materialSearch: 1 - materialLocation: 0 + materialLocation: 1 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 @@ -43,10 +43,10 @@ ModelImporter: meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 - importVisibility: 0 + importVisibility: 1 importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importCameras: 1 + importLights: 1 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -54,7 +54,7 @@ ModelImporter: keepQuads: 0 weldVertices: 1 preserveHierarchy: 0 - indexFormat: 1 + indexFormat: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -65,9 +65,9 @@ ModelImporter: tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 - tangentImportMode: 4 - normalCalculationMode: 0 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 blendShapeNormalImportMode: 1 normalSmoothingSource: 0 importAnimation: 0 @@ -86,7 +86,7 @@ ModelImporter: rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 - skeletonHasParents: 0 + skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 0 humanoidOversampling: 1 diff --git a/Assets/ManagedResources/EffectResUI/PokemonEgg/Prefab/Effect_Dan_changzhu.prefab b/Assets/ManagedResources/EffectResUI/PokemonEgg/Prefab/Effect_Dan_changzhu.prefab index 468bece323..6239348270 100644 --- a/Assets/ManagedResources/EffectResUI/PokemonEgg/Prefab/Effect_Dan_changzhu.prefab +++ b/Assets/ManagedResources/EffectResUI/PokemonEgg/Prefab/Effect_Dan_changzhu.prefab @@ -110,7 +110,7 @@ Transform: - {fileID: 2516152968636828215} - {fileID: 7367980116930690162} m_Father: {fileID: 7869096045278935994} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2803594239840302515 GameObject: @@ -221,7 +221,7 @@ Transform: m_LocalScale: {x: 649.79517, y: 786.04755, z: 649.79517} m_Children: [] m_Father: {fileID: 7869096045278935994} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7390075379482925528 MeshFilter: @@ -287,80 +287,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &4111566810421267153 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3070996744736575632} - - component: {fileID: 6240813373217079363} - - component: {fileID: 7985721650033716140} - m_Layer: 5 - m_Name: btn_summon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3070996744736575632 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4111566810421267153} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7869096045278935994} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 9, y: 144} - m_SizeDelta: {x: 946, y: 1072} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6240813373217079363 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4111566810421267153} - m_CullTransparentMesh: 0 ---- !u!114 &7985721650033716140 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4111566810421267153} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9c5db8fd7cfbde544b0dc0da143c7fcc, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &4344452875793189097 GameObject: m_ObjectHideFlags: 0 @@ -391,7 +317,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7869096045278935994} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -90, y: -90.00101, z: 90.00101} --- !u!198 &1673989434155266571 ParticleSystem: @@ -5147,7 +5073,7 @@ Transform: m_LocalScale: {x: 336.99643, y: 288.30023, z: 205.77333} m_Children: [] m_Father: {fileID: 7869096045278935994} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -89.717} --- !u!33 &8155138845953895358 MeshFilter: @@ -5301,7 +5227,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7869096045278935994} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &725413648498173920 ParticleSystem: @@ -10057,7 +9983,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7869096045278935994} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -14822,7 +14748,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7869096045278935994 Transform: m_ObjectHideFlags: 0 @@ -14834,7 +14760,6 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3070996744736575632} - {fileID: 2304687224590797183} - {fileID: 4865317415784798161} - {fileID: 5195058326721827759} diff --git a/Assets/ManagedResources/EffectResUI/PokemonEgg/Texture.meta b/Assets/ManagedResources/EffectResUI/PokemonEgg/Texture.meta new file mode 100644 index 0000000000..ed3ed2cab7 --- /dev/null +++ b/Assets/ManagedResources/EffectResUI/PokemonEgg/Texture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 62f804843082a784db427cf49e80fdc7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Effects/Textures/H_zhezhao_101.tga b/Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/H_zhezhao_101.tga similarity index 100% rename from Assets/ManagedResources/Effects/Textures/H_zhezhao_101.tga rename to Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/H_zhezhao_101.tga diff --git a/Assets/ManagedResources/Effects/Textures/H_zhezhao_101.tga.meta b/Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/H_zhezhao_101.tga.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/H_zhezhao_101.tga.meta rename to Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/H_zhezhao_101.tga.meta diff --git a/Assets/ManagedResources/Effects/Textures/dan.png b/Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/dan.png similarity index 100% rename from Assets/ManagedResources/Effects/Textures/dan.png rename to Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/dan.png diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_zhezhao_50_tga.tga.meta b/Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/dan.png.meta similarity index 79% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_zhezhao_50_tga.tga.meta rename to Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/dan.png.meta index 6840b456f4..0a3e267717 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_zhezhao_50_tga.tga.meta +++ b/Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/dan.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 72af14763bf1d2940a361056f0ea3a18 +guid: 5d15d7e51a9be8c499600bb7bbd89f3f TextureImporter: fileIDToRecycleName: {} externalObjects: {} serializedVersion: 9 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -27,17 +27,17 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 filterMode: -1 - aniso: -1 + aniso: 1 mipBias: -100 - wrapU: -1 - wrapV: -1 + wrapU: 1 + wrapV: 1 wrapW: -1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 2 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Effects/Textures/dan_liehen.tga b/Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/dan_liehen.tga similarity index 100% rename from Assets/ManagedResources/Effects/Textures/dan_liehen.tga rename to Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/dan_liehen.tga diff --git a/Assets/ManagedResources/Effects/Textures/dan_liehen.tga.meta b/Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/dan_liehen.tga.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/dan_liehen.tga.meta rename to Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/dan_liehen.tga.meta diff --git a/Assets/ManagedResources/Effects/Textures/yun.png b/Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/yun.png similarity index 100% rename from Assets/ManagedResources/Effects/Textures/yun.png rename to Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/yun.png diff --git a/Assets/ManagedResources/Effects/Textures/yun.png.meta b/Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/yun.png.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/yun.png.meta rename to Assets/ManagedResources/EffectResUI/PokemonEgg/Texture/yun.png.meta diff --git a/Assets/ManagedResources/EffectResUI/ShaiZi.meta b/Assets/ManagedResources/EffectResUI/ShaiZi.meta index e59952ce53..d5d9ebb85a 100644 --- a/Assets/ManagedResources/EffectResUI/ShaiZi.meta +++ b/Assets/ManagedResources/EffectResUI/ShaiZi.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4249d15862c283c45a55c9189e3586f1 +guid: f5903311e63840b4e9ffe7b07b4b68a3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/EffectResUI/ShaiZi/Animation.meta b/Assets/ManagedResources/EffectResUI/ShaiZi/Animation.meta index 4ba273a0b9..e9af6e14b6 100644 --- a/Assets/ManagedResources/EffectResUI/ShaiZi/Animation.meta +++ b/Assets/ManagedResources/EffectResUI/ShaiZi/Animation.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ea424a24b552cef4bab375b68a9cc085 +guid: 79f6c94313568d449ac182b2fc061c8b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian.meta b/Assets/ManagedResources/EffectResUI/SheJiDaDian.meta index 00fd7e943a..f0ab732eb9 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian.meta +++ b/Assets/ManagedResources/EffectResUI/SheJiDaDian.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 91a80ad3ce16f034b9941c8fd5fce60f +guid: ff57c949de5e7984a9f02a6356f9452c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Animation.meta b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Animation.meta index 5ba1d8c17f..aeff647058 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Animation.meta +++ b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Animation.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e48917c38d224a240af7925395a4f9f5 +guid: b32ed7479c04b4542962b01c998fb7ec folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Animation/DynamicActivityPanel_box_daiji.controller b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Animation/DynamicActivityPanel_box_daiji.controller index 7a352942b4..51a55bcc3c 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Animation/DynamicActivityPanel_box_daiji.controller +++ b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Animation/DynamicActivityPanel_box_daiji.controller @@ -8,13 +8,7 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: DynamicActivityPanel_box_daiji serializedVersion: 5 - m_AnimatorParameters: - - m_Name: dakai - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_AnimatorParameters: [] m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -28,31 +22,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &1101188606907880752 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: dakai - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102617346665670686} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.9166667 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &1102461298529390142 AnimatorState: serializedVersion: 5 @@ -63,8 +32,7 @@ AnimatorState: m_Name: daiji m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101188606907880752} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -74,7 +42,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: bb0c71e8a3ebd2745ac2e793c2c6e169, type: 2} + m_Motion: {fileID: 7400000, guid: 01a33c1ba0b3d76499676d0b67e932a5, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -100,7 +68,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 01a33c1ba0b3d76499676d0b67e932a5, type: 2} + m_Motion: {fileID: 7400000, guid: bb0c71e8a3ebd2745ac2e793c2c6e169, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -117,7 +85,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 1102617346665670686} - m_Position: {x: 264, y: 36, z: 0} + m_Position: {x: 240, y: 60, z: 0} - serializedVersion: 1 m_State: {fileID: 1102461298529390142} m_Position: {x: 252, y: -48, z: 0} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials.meta b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials.meta index 6c45e47d0a..53147c3e95 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials.meta +++ b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b6f10167d17013940bc2ee221469feec +guid: 914d7e6e646204347b8560b20b37523c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/AoBing_MZ_32.mat b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/AoBing_MZ_32.mat deleted file mode 100644 index bbab8d2eea..0000000000 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/AoBing_MZ_32.mat +++ /dev/null @@ -1,121 +0,0 @@ -%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: AoBing_MZ_32 - m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3005 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _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} - - _DissolveSrc: - m_Texture: {fileID: 2800000, guid: a522db3de7bf79b4687234f73dc2031a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DissolveTex: - 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: 35a225c07b1f83a45bebf13106736f59, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _Mask: - m_Texture: {fileID: 2800000, guid: 3999ddd8ab093f540b331b92dc2b6553, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 2800000, guid: 98fd140f121f18049925473d22f6122d, 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} - m_Floats: - - _Amount: 0.28 - - _BlendMode: 0 - - _BlendOp: -1 - - _BumpScale: 1 - - _CullMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _Dissolve: 0 - - _DissolveEdge: 0 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Illuminate: 0 - - _InvFade: 0.01 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _PZWrite: 0 - - _Parallax: 0.02 - - _QueueOffset: 0 - - _RenderMode: 0 - - _ReplaySpeed: 4 - - _Shininess: 0.03 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _StartAmount: 0.1 - - _Thickness: 0 - - _Tile: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAnimate: {r: 0.15, g: 0.15, b: 1, a: 1} - - _DissColor: {r: 1, g: 1, b: 1, a: 1} - - _EdgeColor: {r: 1, g: 0.8, b: 0.3, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _NumTexTiles: {r: 4, g: 4, b: 0, a: 0} - - _Scrolls: {r: 1, g: 1, b: 1, a: 1} - - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - - _Tiling: {r: 2, g: 2, b: 2, a: 1} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/AoBing_MZ_32_mat.mat b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/AoBing_MZ_32_mat.mat deleted file mode 100644 index 5f6cce017f..0000000000 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/AoBing_MZ_32_mat.mat +++ /dev/null @@ -1,122 +0,0 @@ -%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: AoBing_MZ_32_mat - m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3005 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _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} - - _DissolveSrc: - m_Texture: {fileID: 2800000, guid: a522db3de7bf79b4687234f73dc2031a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DissolveTex: - 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: 35a225c07b1f83a45bebf13106736f59, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _Mask: - m_Texture: {fileID: 2800000, guid: 3999ddd8ab093f540b331b92dc2b6553, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 2800000, guid: 98fd140f121f18049925473d22f6122d, 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} - m_Floats: - - _Amount: 0.28 - - _BlendMode: 0 - - _BlendOp: -1 - - _BumpScale: 1 - - _CullMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _Dissolve: 0 - - _DissolveEdge: 0 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Illuminate: 0 - - _InvFade: 0.01 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _PZWrite: 0 - - _Parallax: 0.02 - - _QueueOffset: 0 - - _RenderMode: 0 - - _ReplaySpeed: 4 - - _Shininess: 0.03 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _StartAmount: 0.1 - - _Stencil: 0 - - _Thickness: 0 - - _Tile: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAnimate: {r: 0.15, g: 0.15, b: 1, a: 1} - - _DissColor: {r: 1, g: 1, b: 1, a: 1} - - _EdgeColor: {r: 1, g: 0.8, b: 0.3, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _NumTexTiles: {r: 4, g: 4, b: 0, a: 0} - - _Scrolls: {r: 1, g: 1, b: 1, a: 1} - - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - - _Tiling: {r: 2, g: 2, b: 2, a: 1} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_03.mat b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_03.mat deleted file mode 100644 index 978222636d..0000000000 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_03.mat +++ /dev/null @@ -1,117 +0,0 @@ -%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: shuizhu_03 - m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3003 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _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} - - _DissolveSrc: - m_Texture: {fileID: 2800000, guid: a522db3de7bf79b4687234f73dc2031a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DissolveTex: - 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: 5ccdfda035691d84096219990deae330, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _Mask: - m_Texture: {fileID: 2800000, guid: 3999ddd8ab093f540b331b92dc2b6553, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 2800000, guid: 98fd140f121f18049925473d22f6122d, 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} - m_Floats: - - _Amount: 0.28 - - _BlendMode: 0 - - _BlendOp: -1 - - _BumpScale: 1 - - _CullMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _Dissolve: 0 - - _DissolveEdge: 0 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Illuminate: 0 - - _InvFade: 0.01 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _PZWrite: 0 - - _Parallax: 0.02 - - _QueueOffset: 0 - - _RenderMode: 0 - - _ReplaySpeed: 4 - - _Shininess: 0.03 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _StartAmount: 0.1 - - _Thickness: 0 - - _Tile: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAnimate: {r: 0.15, g: 0.15, b: 1, a: 1} - - _DissColor: {r: 1, g: 1, b: 1, a: 1} - - _EdgeColor: {r: 1, g: 0.8, b: 0.3, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _NumTexTiles: {r: 4, g: 4, b: 0, a: 0} - - _Scrolls: {r: 1, g: 1, b: 1, a: 1} - - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - - _Tiling: {r: 2, g: 2, b: 2, a: 1} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_03_mat.mat b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_03_mat.mat deleted file mode 100644 index 42290ed2f5..0000000000 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_03_mat.mat +++ /dev/null @@ -1,118 +0,0 @@ -%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: shuizhu_03_mat - m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3003 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _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} - - _DissolveSrc: - m_Texture: {fileID: 2800000, guid: a522db3de7bf79b4687234f73dc2031a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DissolveTex: - 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: 5ccdfda035691d84096219990deae330, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _Mask: - m_Texture: {fileID: 2800000, guid: 3999ddd8ab093f540b331b92dc2b6553, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 2800000, guid: 98fd140f121f18049925473d22f6122d, 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} - m_Floats: - - _Amount: 0.28 - - _BlendMode: 0 - - _BlendOp: -1 - - _BumpScale: 1 - - _CullMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _Dissolve: 0 - - _DissolveEdge: 0 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Illuminate: 0 - - _InvFade: 0.01 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _PZWrite: 0 - - _Parallax: 0.02 - - _QueueOffset: 0 - - _RenderMode: 0 - - _ReplaySpeed: 4 - - _Shininess: 0.03 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _StartAmount: 0.1 - - _Stencil: 0 - - _Thickness: 0 - - _Tile: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAnimate: {r: 0.15, g: 0.15, b: 1, a: 1} - - _DissColor: {r: 1, g: 1, b: 1, a: 1} - - _EdgeColor: {r: 1, g: 0.8, b: 0.3, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _NumTexTiles: {r: 4, g: 4, b: 0, a: 0} - - _Scrolls: {r: 1, g: 1, b: 1, a: 1} - - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - - _Tiling: {r: 2, g: 2, b: 2, a: 1} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_04.mat b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_04.mat deleted file mode 100644 index 6cbae55c2f..0000000000 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_04.mat +++ /dev/null @@ -1,117 +0,0 @@ -%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: shuizhu_04 - m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _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} - - _DissolveSrc: - m_Texture: {fileID: 2800000, guid: a522db3de7bf79b4687234f73dc2031a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DissolveTex: - 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: a3883303da457324b84793486cb204e5, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _Mask: - m_Texture: {fileID: 2800000, guid: 3999ddd8ab093f540b331b92dc2b6553, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 2800000, guid: 98fd140f121f18049925473d22f6122d, 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} - m_Floats: - - _Amount: 0.28 - - _BlendMode: 0 - - _BlendOp: -1 - - _BumpScale: 1 - - _CullMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _Dissolve: 0 - - _DissolveEdge: 0 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Illuminate: 0 - - _InvFade: 0.01 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _PZWrite: 0 - - _Parallax: 0.02 - - _QueueOffset: 0 - - _RenderMode: 0 - - _ReplaySpeed: 4 - - _Shininess: 0.03 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _StartAmount: 0.1 - - _Thickness: 0 - - _Tile: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAnimate: {r: 0.15, g: 0.15, b: 1, a: 1} - - _DissColor: {r: 1, g: 1, b: 1, a: 1} - - _EdgeColor: {r: 1, g: 0.8, b: 0.3, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _NumTexTiles: {r: 4, g: 4, b: 0, a: 0} - - _Scrolls: {r: 1, g: 1, b: 1, a: 1} - - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - - _Tiling: {r: 2, g: 2, b: 2, a: 1} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_04_mat.mat b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_04_mat.mat deleted file mode 100644 index 965a1c380b..0000000000 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_04_mat.mat +++ /dev/null @@ -1,118 +0,0 @@ -%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: shuizhu_04_mat - m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _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} - - _DissolveSrc: - m_Texture: {fileID: 2800000, guid: a522db3de7bf79b4687234f73dc2031a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DissolveTex: - 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: a3883303da457324b84793486cb204e5, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _Mask: - m_Texture: {fileID: 2800000, guid: 3999ddd8ab093f540b331b92dc2b6553, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 2800000, guid: 98fd140f121f18049925473d22f6122d, 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} - m_Floats: - - _Amount: 0.28 - - _BlendMode: 0 - - _BlendOp: -1 - - _BumpScale: 1 - - _CullMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _Dissolve: 0 - - _DissolveEdge: 0 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Illuminate: 0 - - _InvFade: 0.01 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _PZWrite: 0 - - _Parallax: 0.02 - - _QueueOffset: 0 - - _RenderMode: 0 - - _ReplaySpeed: 4 - - _Shininess: 0.03 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _StartAmount: 0.1 - - _Stencil: 0 - - _Thickness: 0 - - _Tile: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAnimate: {r: 0.15, g: 0.15, b: 1, a: 1} - - _DissColor: {r: 1, g: 1, b: 1, a: 1} - - _EdgeColor: {r: 1, g: 0.8, b: 0.3, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _NumTexTiles: {r: 4, g: 4, b: 0, a: 0} - - _Scrolls: {r: 1, g: 1, b: 1, a: 1} - - _SpecColor: {r: 1, g: 1, b: 1, a: 1} - - _Tiling: {r: 2, g: 2, b: 2, a: 1} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_04_mat.mat.meta b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_04_mat.mat.meta deleted file mode 100644 index 5d5e259cec..0000000000 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Materials/shuizhu_04_mat.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 73296c5f69e082c45b042b4fbd33c746 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Model/ShiZiPian_new.FBX b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Model/ShiZiPian_new.FBX deleted file mode 100644 index ab465e37d1..0000000000 Binary files a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Model/ShiZiPian_new.FBX and /dev/null differ diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Model/ShiZiPian_new_FBX.FBX b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Model/ShiZiPian_new_FBX.FBX deleted file mode 100644 index ab465e37d1..0000000000 Binary files a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Model/ShiZiPian_new_FBX.FBX and /dev/null differ diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Model/ShiZiPian_new_FBX.FBX.meta b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Model/ShiZiPian_new_FBX.FBX.meta deleted file mode 100644 index 66581ac919..0000000000 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Model/ShiZiPian_new_FBX.FBX.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 2e051b35fe363cc43aa5107b45ffd100 -ModelImporter: - serializedVersion: 23 - fileIDToRecycleName: - 100000: //RootNode - 400000: //RootNode - 2300000: //RootNode - 3300000: //RootNode - 4300000: ShiZiPian_new - externalObjects: {} - materials: - importMaterials: 0 - materialName: 0 - materialSearch: 1 - materialLocation: 0 - 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: 1 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - importVisibility: 0 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - optimizeMeshForGPU: 1 - keepQuads: 0 - weldVertices: 1 - preserveHierarchy: 0 - indexFormat: 1 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVPackMargin: 4 - useFileScale: 1 - previousCalculatedGlobalScale: 1 - hasPreviousCalculatedGlobalScale: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 4 - normalCalculationMode: 0 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - importAnimation: 0 - copyAvatar: 0 - humanDescription: - serializedVersion: 2 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 0 - lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 0 - humanoidOversampling: 1 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab.meta b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab.meta index 0b2ca38969..787e9b7a71 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab.meta +++ b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2f600479ba035ab488b62c3821b38b44 +guid: 34c92150445f47a4bb8bd043f4eb06e1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_daiji.prefab b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_daiji.prefab similarity index 100% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_daiji.prefab rename to Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_daiji.prefab diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_daiji.prefab.meta b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_daiji.prefab.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_daiji.prefab.meta rename to Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_daiji.prefab.meta diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_dakai.prefab b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_dakai.prefab similarity index 100% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_dakai.prefab rename to Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_dakai.prefab diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_dakai.prefab.meta b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_dakai.prefab.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_dakai.prefab.meta rename to Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_dakai.prefab.meta diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_prefab.prefab b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_prefab.prefab similarity index 100% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_prefab.prefab rename to Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_prefab.prefab diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_prefab.prefab.meta b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_prefab.prefab.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_prefab.prefab.meta rename to Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_prefab.prefab.meta diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture.meta b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture.meta index 2ca2ae6414..cb9d9145c8 100644 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture.meta +++ b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f9a2c9a4d2b83d64f8555b39372bb3af +guid: 7cc531759bdd20c44a97bed1bea4daee folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_tirl_147_01_02.tga b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_tirl_147_01_02.tga deleted file mode 100644 index d2d12cae3b..0000000000 Binary files a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_tirl_147_01_02.tga and /dev/null differ diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_tirl_147_01_02_tga.tga b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_tirl_147_01_02_tga.tga deleted file mode 100644 index d2d12cae3b..0000000000 Binary files a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_tirl_147_01_02_tga.tga and /dev/null differ diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_zhezhao_50.tga b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_zhezhao_50.tga deleted file mode 100644 index 0d45c4505a..0000000000 Binary files a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_zhezhao_50.tga and /dev/null differ diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_zhezhao_50_tga.tga b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_zhezhao_50_tga.tga deleted file mode 100644 index 0d45c4505a..0000000000 Binary files a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Texture/H_zhezhao_50_tga.tga and /dev/null differ diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActivity.meta b/Assets/ManagedResources/Prefabs/UI/DynamicActivity.meta deleted file mode 100644 index 1ffe252dca..0000000000 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActivity.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6dd56c4439cc9054cb9cc0a2552e2309 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: lz4/prefabs/ui/dynamicactivity - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Spine/ive2d_npc_map_nv.meta b/Assets/ManagedResources/Spine/ive2d_npc_map_nv.meta deleted file mode 100644 index 56c7a19844..0000000000 --- a/Assets/ManagedResources/Spine/ive2d_npc_map_nv.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 36f6ad8b4d5ea2440ba1d0b0c4684a0c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: lz4/spine/ive2d_npc_map_nv - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Spine/live2d_npc_map.meta b/Assets/ManagedResources/Spine/live2d_npc_map.meta deleted file mode 100644 index 4a96c9ab60..0000000000 --- a/Assets/ManagedResources/Spine/live2d_npc_map.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4e606ce3926ebdc498f1fc9692680849 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: lz4/spine/live2d_npc_map - assetBundleVariant: unity3d