diff --git a/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi.anim b/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi_anim.anim similarity index 99% rename from Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi.anim rename to Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi_anim.anim index 7a813d8baa..500b5e8763 100644 --- a/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi.anim +++ b/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi_anim.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI_Effect_BaoXiang_KaiQi + m_Name: UI_Effect_BaoXiang_KaiQi_anim serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi.anim.meta b/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi_anim.anim.meta similarity index 100% rename from Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi.anim.meta rename to Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi_anim.anim.meta diff --git a/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi.controller b/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi_controller.controller similarity index 97% rename from Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi.controller rename to Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi_controller.controller index abca90d118..ebdbe18fbe 100644 --- a/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi.controller +++ b/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi_controller.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI_Effect_BaoXiang_KaiQi + m_Name: UI_Effect_BaoXiang_KaiQi_controller serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi.controller.meta b/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi_controller.controller.meta similarity index 100% rename from Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi.controller.meta rename to Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KaiQi_controller.controller.meta diff --git a/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi.anim b/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi_anim.anim similarity index 99% rename from Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi.anim rename to Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi_anim.anim index 0fadd82a5b..4a7b62cac6 100644 --- a/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi.anim +++ b/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi_anim.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI_Effect_BaoXiang_KeKaiQi + m_Name: UI_Effect_BaoXiang_KeKaiQi_anim serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi.anim.meta b/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi_anim.anim.meta similarity index 100% rename from Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi.anim.meta rename to Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi_anim.anim.meta diff --git a/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi.controller b/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi_controller.controller similarity index 97% rename from Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi.controller rename to Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi_controller.controller index 73b0543acd..5fd7a5450c 100644 --- a/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi.controller +++ b/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi_controller.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI_Effect_BaoXiang_KeKaiQi + m_Name: UI_Effect_BaoXiang_KeKaiQi_controller serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi.controller.meta b/Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi_controller.controller.meta similarity index 100% rename from Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi.controller.meta rename to Assets/ManagedResources/Effects/Animation/UI_Effect_BaoXiang_KeKaiQi_controller.controller.meta diff --git a/Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi.anim b/Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi_anim.anim similarity index 98% rename from Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi.anim rename to Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi_anim.anim index 215a4623f4..1da05e617f 100644 --- a/Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi.anim +++ b/Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi_anim.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI_Effect_MuBiaoJiangLi + m_Name: UI_Effect_MuBiaoJiangLi_anim serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi.anim.meta b/Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi_anim.anim.meta similarity index 100% rename from Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi.anim.meta rename to Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi_anim.anim.meta diff --git a/Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi.controller b/Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi_controller.controller similarity index 97% rename from Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi.controller rename to Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi_controller.controller index ec0025df5a..9ae09d090b 100644 --- a/Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi.controller +++ b/Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi_controller.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI_Effect_MuBiaoJiangLi + m_Name: UI_Effect_MuBiaoJiangLi_controller serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi.controller.meta b/Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi_controller.controller.meta similarity index 100% rename from Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi.controller.meta rename to Assets/ManagedResources/Effects/Animation/UI_Effect_MuBiaoJiangLi_controller.controller.meta diff --git a/Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_01.PNG b/Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_01_PNG.PNG similarity index 100% rename from Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_01.PNG rename to Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_01_PNG.PNG diff --git a/Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_01.PNG.meta b/Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_01_PNG.PNG.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_01.PNG.meta rename to Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_01_PNG.PNG.meta diff --git a/Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_04.png b/Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_04_png.png similarity index 100% rename from Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_04.png rename to Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_04_png.png diff --git a/Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_04.png.meta b/Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_04_png.png.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_04.png.meta rename to Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_04_png.png.meta diff --git a/Assets/ManagedResources/Effects/Textures/ui_mainwindow_TX_4.PNG b/Assets/ManagedResources/Effects/Textures/ui_mainwindow_TX_4_PNG.PNG similarity index 100% rename from Assets/ManagedResources/Effects/Textures/ui_mainwindow_TX_4.PNG rename to Assets/ManagedResources/Effects/Textures/ui_mainwindow_TX_4_PNG.PNG diff --git a/Assets/ManagedResources/Effects/Textures/ui_mainwindow_TX_4.PNG.meta b/Assets/ManagedResources/Effects/Textures/ui_mainwindow_TX_4_PNG.PNG.meta similarity index 100% rename from Assets/ManagedResources/Effects/Textures/ui_mainwindow_TX_4.PNG.meta rename to Assets/ManagedResources/Effects/Textures/ui_mainwindow_TX_4_PNG.PNG.meta diff --git a/Assets/ManagedResources/PublicArtRes/Materials/Default-Diffuse.mat b/Assets/ManagedResources/PublicArtRes/Materials/Default-Diffuse.mat deleted file mode 100644 index fef7c6ab6a..0000000000 --- a/Assets/ManagedResources/PublicArtRes/Materials/Default-Diffuse.mat +++ /dev/null @@ -1,77 +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: Default-Diffuse - m_Shader: {fileID: 4800000, guid: 1cf234f48b286c5458c446aca9ea60c7, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - 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} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - 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: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/ManagedResources/PublicArtRes/Materials/Default-Diffuse.mat.meta b/Assets/ManagedResources/PublicArtRes/Materials/Default-Diffuse.mat.meta deleted file mode 100644 index c255cf02bf..0000000000 --- a/Assets/ManagedResources/PublicArtRes/Materials/Default-Diffuse.mat.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 5767ccb512d02d54683df9c2a2ca0c8b -timeCreated: 1505447278 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/PublicArtRes/Shaders/Default-Diffuse.shader.meta b/Assets/ManagedResources/PublicArtRes/Shaders/Default-Diffuse.shader.meta index d8a9251f60..1e717f9f1c 100644 --- a/Assets/ManagedResources/PublicArtRes/Shaders/Default-Diffuse.shader.meta +++ b/Assets/ManagedResources/PublicArtRes/Shaders/Default-Diffuse.shader.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 1cf234f48b286c5458c446aca9ea60c7 -timeCreated: 1505447125 -licenseType: Free +guid: e7bf6a1d8e2243541998f5f11ea4284e ShaderImporter: + externalObjects: {} defaultTextures: [] + nonModifiableTextures: [] userData: assetBundleName: assetBundleVariant: