diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/角色/Materials/M_YiCiXingBuLiaoa.001.mat b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/角色/Materials/lv.mat similarity index 99% rename from Assets/Art/Models/LouDi/A_QvanChangJing/Animation/角色/Materials/M_YiCiXingBuLiaoa.001.mat rename to Assets/Art/Models/LouDi/A_QvanChangJing/Animation/角色/Materials/lv.mat index 7848cb42..c3e18e89 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/角色/Materials/M_YiCiXingBuLiaoa.001.mat +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/角色/Materials/lv.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: M_YiCiXingBuLiaoa.001 + m_Name: lv m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/角色/Materials/M_YiCiXingBuLiaoa.001.mat.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/角色/Materials/lv.mat.meta similarity index 100% rename from Assets/Art/Models/LouDi/A_QvanChangJing/Animation/角色/Materials/M_YiCiXingBuLiaoa.001.mat.meta rename to Assets/Art/Models/LouDi/A_QvanChangJing/Animation/角色/Materials/lv.mat.meta diff --git a/Assets/Resources/Mat/blue.png b/Assets/Resources/Mat/blue.png new file mode 100644 index 00000000..3ff21d8b Binary files /dev/null and b/Assets/Resources/Mat/blue.png differ diff --git a/Assets/Resources/Mat/blue.png.meta b/Assets/Resources/Mat/blue.png.meta new file mode 100644 index 00000000..084073d9 --- /dev/null +++ b/Assets/Resources/Mat/blue.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 79bcd594df4c95940b96ee87e556ca03 +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 + ignoreMasterTextureLimit: 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Textures/LouDi/AnimationQvan/yisheng_nan_M_YiCiXingBuLiaoa.001_AlbedoTransparency.png b/Assets/Resources/Mat/lv.png similarity index 100% rename from Assets/Art/Textures/LouDi/AnimationQvan/yisheng_nan_M_YiCiXingBuLiaoa.001_AlbedoTransparency.png rename to Assets/Resources/Mat/lv.png diff --git a/Assets/Art/Textures/LouDi/AnimationQvan/yisheng_nan_M_YiCiXingBuLiaoa.001_AlbedoTransparency.png.meta b/Assets/Resources/Mat/lv.png.meta similarity index 100% rename from Assets/Art/Textures/LouDi/AnimationQvan/yisheng_nan_M_YiCiXingBuLiaoa.001_AlbedoTransparency.png.meta rename to Assets/Resources/Mat/lv.png.meta diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml index 4749f348..6ec43a84 100644 --- a/Data/Xml/Exam.xml +++ b/Data/Xml/Exam.xml @@ -787,7 +787,7 @@ - + @@ -1283,6 +1283,8 @@ + + @@ -1460,33 +1462,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1514,6 +1490,8 @@ + + @@ -1695,7 +1673,7 @@ - + diff --git a/Data/Xml/Study.xml b/Data/Xml/Study.xml index 4b0c5941..a45304f6 100644 --- a/Data/Xml/Study.xml +++ b/Data/Xml/Study.xml @@ -746,6 +746,7 @@ + @@ -1607,11 +1608,19 @@ + + + + + + + + @@ -1684,6 +1693,8 @@ + + @@ -1796,7 +1807,7 @@ - + @@ -1812,40 +1823,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1924,14 +1901,12 @@ - - @@ -1945,12 +1920,20 @@ + + + + + + + + @@ -2138,7 +2121,6 @@ - @@ -2166,6 +2148,10 @@ + + + + @@ -2346,7 +2332,6 @@ -