Effects/UI/B_ZuoQi/ZuoQiWeiYang/Effect_Pet_JiNeng.prefab
@@ -11,16 +11,16 @@ m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1903610481447070} m_IsPrefabParent: 1 --- !u!1 &1403262474871038 --- !u!1 &1241468090582066 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - component: {fileID: 4395224553508966} - component: {fileID: 33613742545271318} - component: {fileID: 23091257667381230} - component: {fileID: 4474863591322036} - component: {fileID: 33022079643092238} - component: {fileID: 23612305682822362} m_Layer: 5 m_Name: yun m_TagString: Untagged @@ -43,18 +43,18 @@ m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!1 &1698087769850266 --- !u!1 &1632042828463170 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - component: {fileID: 4164818242984558} - component: {fileID: 33511669029720896} - component: {fileID: 23569979579466366} - component: {fileID: 4909099896111704} - component: {fileID: 33500081794510336} - component: {fileID: 23771814933296464} m_Layer: 5 m_Name: l m_Name: yuan_01 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -92,32 +92,32 @@ m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &4164818242984558 --- !u!4 &4474863591322036 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1698087769850266} m_GameObject: {fileID: 1241468090582066} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.000059605, y: 0.079107, z: -15.8855} m_LocalScale: {x: 12.084166, y: 12.08417, z: 12.08417} m_Children: [] m_Father: {fileID: 224770059629516760} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4395224553508966 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1403262474871038} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.000059605, y: 0, z: 0} m_LocalScale: {x: 152.52437, y: 152.52435, z: 152.52435} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 143.32535, y: 143.32532, z: 143.32532} m_Children: [] m_Father: {fileID: 224770059629516760} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4909099896111704 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1632042828463170} m_LocalRotation: {x: 0.26674363, y: -0.7332565, z: 0.44246632, w: 0.44204792} m_LocalPosition: {x: 0, y: 0, z: 0.00000065377} m_LocalScale: {x: 81.149506, y: 81.14954, z: 81.14954} m_Children: [] m_Father: {fileID: 224770059629516760} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 62.216003, y: -117.83201, z: 0} --- !u!4 &4924957380360836 Transform: m_ObjectHideFlags: 1 @@ -125,18 +125,18 @@ m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1761584747033970} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -17} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224770059629516760} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &23091257667381230 --- !u!23 &23612305682822362 MeshRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1403262474871038} m_GameObject: {fileID: 1241468090582066} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -163,12 +163,12 @@ m_SortingLayerID: -117431673 m_SortingLayer: 1 m_SortingOrder: 10000 --- !u!23 &23569979579466366 --- !u!23 &23771814933296464 MeshRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1698087769850266} m_GameObject: {fileID: 1632042828463170} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -176,7 +176,7 @@ m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_Materials: - {fileID: 2100000, guid: a748721531cd58c46a0d72488ce71add, type: 2} - {fileID: 2100000, guid: 1714dbfd4717df345ae0d023a5245b0a, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -194,21 +194,21 @@ m_LightmapParameters: {fileID: 0} m_SortingLayerID: -117431673 m_SortingLayer: 1 m_SortingOrder: 10001 --- !u!33 &33511669029720896 m_SortingOrder: 10000 --- !u!33 &33022079643092238 MeshFilter: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1698087769850266} m_Mesh: {fileID: 4300000, guid: 2bc4f34ce8f868f47938b28f7f8a4b37, type: 3} --- !u!33 &33613742545271318 MeshFilter: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1403262474871038} m_GameObject: {fileID: 1241468090582066} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33500081794510336 MeshFilter: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1632042828463170} m_Mesh: {fileID: 4300000, guid: 973368a9f14a46248ad471a8f5758838, type: 3} --- !u!198 &198368255012395986 ParticleSystem: m_ObjectHideFlags: 1 @@ -266,7 +266,7 @@ moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} scalingMode: 1 randomSeed: -605800529 randomSeed: -1907837379 InitialModule: serializedVersion: 3 enabled: 1 @@ -3438,8 +3438,8 @@ m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4164818242984558} - {fileID: 4395224553508966} - {fileID: 4909099896111704} - {fileID: 4474863591322036} - {fileID: 4924957380360836} m_Father: {fileID: 224896646186805120} m_RootOrder: 0 @@ -3455,7 +3455,7 @@ m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1903610481447070} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} 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: @@ -3465,6 +3465,6 @@ 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: 0, y: -82} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} Effects/UI/B_ZuoQi/ZuoQiWeiYang/Material/01.mat
@@ -75,4 +75,4 @@ m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _TintColor: {r: 0.9264706, g: 0.34991643, b: 0.21799308, a: 0.166} - _TintColor: {r: 0.9411765, g: 0.41617954, b: 0.076124586, a: 0.253} Effects/UI/B_ZuoQi/ZuoQiWeiYang/Material/03.mat
@@ -75,4 +75,4 @@ m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _TintColor: {r: 0.97794116, g: 0.6586721, b: 0.17976859, a: 0.497} - _TintColor: {r: 0.86764705, g: 0.6045371, b: 0.13397494, a: 0.834} Effects/UI/B_ZuoQi/ZuoQiWeiYang/Material/04.mat
File was renamed from Effects/UI/B_ZuoQi/ZuoQiWeiYang/Material/02.mat @@ -6,7 +6,7 @@ m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: 02 m_Name: 04 m_Shader: {fileID: 4800000, guid: c734192df587b0d41a5736bbfba6676c, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 @@ -39,7 +39,7 @@ m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 8845bfd6c395a2448828c6b2e03fc876, type: 3} m_Texture: {fileID: 2800000, guid: 43066a456055f0b4c9d76b6bd21f5128, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -71,8 +71,8 @@ - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _RollTimeX: 0 - _RollTimeY: -0.2 - _RollTimeX: 1 - _RollTimeY: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -81,4 +81,4 @@ m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _TintColor: {r: 0.88235295, g: 0.4572844, b: 0.071366794, a: 0.466} - _TintColor: {r: 0.8970589, g: 0.46399605, b: 0, a: 1} Effects/UI/B_ZuoQi/ZuoQiWeiYang/Material/04.mat.meta
File was renamed from Effects/UI/B_ZuoQi/ZuoQiWeiYang/Material/02.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: a748721531cd58c46a0d72488ce71add guid: 1714dbfd4717df345ae0d023a5245b0a timeCreated: 1534745093 licenseType: Pro NativeFormatImporter: Effects/UI/B_ZuoQi/ZuoQiWeiYang/Model/Effect_Pet_JiNeng.FBXBinary files differ
Effects/UI/B_ZuoQi/ZuoQiWeiYang/Model/Effect_Pet_JiNeng.FBX.meta
@@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2bc4f34ce8f868f47938b28f7f8a4b37 timeCreated: 1494491220 guid: 973368a9f14a46248ad471a8f5758838 timeCreated: 1534751654 licenseType: Pro ModelImporter: serializedVersion: 19 @@ -9,7 +9,7 @@ 400000: //RootNode 2300000: //RootNode 3300000: //RootNode 4300000: moxing_yxc_58 4300000: Tube002 9500000: //RootNode materials: importMaterials: 0 @@ -19,7 +19,7 @@ legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 1 optimizeGameObjects: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -73,7 +73,7 @@ rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 0 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 Effects/UI/B_ZuoQi/ZuoQiWeiYang/Texture/03.pngBinary files differ
Effects/UI/B_ZuoQi/ZuoQiWeiYang/Texture/03.tgaBinary files differ
Effects/UI/B_ZuoQi/ZuoQiWeiYang/Texture/03.tga.meta
File was renamed from Effects/UI/B_ZuoQi/ZuoQiWeiYang/Texture/03.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 8845bfd6c395a2448828c6b2e03fc876 timeCreated: 1534750617 guid: 43066a456055f0b4c9d76b6bd21f5128 timeCreated: 1489494008 licenseType: Pro TextureImporter: fileIDToRecycleName: {} @@ -24,13 +24,13 @@ generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: 1 textureFormat: -1 maxTextureSize: 2048 textureSettings: filterMode: -1 aniso: -1 mipBias: -1 wrapMode: -1 wrapMode: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -58,6 +58,14 @@ crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - buildTarget: Standalone maxTextureSize: 2048 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] Effects/y_moxing/Model_yxc/02.FBXBinary files differ
Effects/y_moxing/Model_yxc/02.FBX.meta
New file @@ -0,0 +1,83 @@ fileFormatVersion: 2 guid: 393ca696710e8c44ab4b531629ea46df timeCreated: 1534751654 licenseType: Pro ModelImporter: serializedVersion: 19 fileIDToRecycleName: 100000: //RootNode 400000: //RootNode 2300000: //RootNode 3300000: //RootNode 4300000: Tube002 9500000: //RootNode materials: importMaterials: 0 materialName: 0 materialSearch: 1 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: rigImportErrors: rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] clipAnimations: [] isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 3 addColliders: 0 importBlendShapes: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 0 keepQuads: 0 weldVertices: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 tangentSpace: normalSmoothAngle: 60 normalImportMode: 2 tangentImportMode: 2 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: rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 additionalBone: 0 userData: assetBundleName: assetBundleVariant: Effects/y_tietu/clamp/clamp_0802.tga.meta
@@ -4,12 +4,12 @@ licenseType: Pro TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 correctGamma: 0 fadeOut: 0 borderMipMap: 0 mipMapFadeDistanceStart: 1 @@ -21,10 +21,8 @@ normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 generateCubemap: 6 cubemapConvolution: 0 cubemapConvolutionSteps: 7 cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 @@ -32,10 +30,9 @@ filterMode: -1 aniso: -1 mipBias: -1 wrapMode: 1 wrapMode: 0 nPOTScale: 1 lightmap: 0 rGBM: 0 compressionQuality: 50 spriteMode: 0 spriteExtrude: 1 @@ -44,10 +41,31 @@ spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: -1 buildTargetSettings: [] textureType: 0 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - buildTarget: Standalone maxTextureSize: 2048 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] Maps/Scenes/Map129_Grboss.unity
Diff too large Maps/Scenes/Map129_Grboss/LightingData.assetBinary files differ
Maps/Scenes/Map129_Grboss/LightingData.asset.meta
@@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 8c2efaa33b090c14caa24489cbbb4942 timeCreated: 1523957483 timeCreated: 1534751914 licenseType: Free NativeFormatImporter: mainObjectFileID: 25800000 Maps/Scenes/Map129_Grboss/Lightmap-0_comp_light.exrBinary files differ
Maps/Scenes/Map129_Grboss/Lightmap-0_comp_light.exr.meta
@@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: fcefd6a9626ea5648a0be9827f06aa69 timeCreated: 1523957482 timeCreated: 1534751914 licenseType: Free TextureImporter: fileIDToRecycleName: {}
