GemBattle.git - Gitblit

New file
			@@ -0,0 +1,119 @@
			fileFormatVersion: 2
			guid: 00998a0ab88f1b741bece5564a6e8615
			ModelImporter:
			serializedVersion: 26
			internalIDToNameTable:
			- first:
			1: 100000
			second: //RootNode
			- first:
			4: 400000
			second: //RootNode
			- first:
			21: 2100000
			second: 'Material #906'
			- first:
			23: 2300000
			second: //RootNode
			- first:
			33: 3300000
			second: //RootNode
			- first:
			43: 4300000
			second: Object026
			- first:
			74: 7400000
			second: Take 001
			- first:
			95: 9500000
			second: //RootNode
			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
			sortHierarchyByName: 1
			importVisibility: 1
			importBlendShapes: 1
			importCameras: 1
			importLights: 1
			swapUVChannels: 0
			generateSecondaryUV: 0
			useFileUnits: 1
			keepQuads: 0
			weldVertices: 1
			preserveHierarchy: 0
			skinWeightsMode: 0
			maxBonesPerVertex: 4
			minBoneWeight: 0.001
			meshOptimizationFlags: -1
			indexFormat: 0
			secondaryUVAngleDistortion: 8
			secondaryUVAreaDistortion: 15.000001
			secondaryUVHardAngle: 88
			secondaryUVPackMargin: 4
			useFileScale: 1
			tangentSpace:
			normalSmoothAngle: 60
			normalImportMode: 0
			tangentImportMode: 3
			normalCalculationMode: 4
			legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
			blendShapeNormalImportMode: 1
			normalSmoothingSource: 0
			referencedClips: []
			importAnimation: 0
			copyAvatar: 0
			humanDescription:
			serializedVersion: 3
			human: []
			skeleton: []
			armTwist: 0.5
			foreArmTwist: 0.5
			upperLegTwist: 0.5
			legTwist: 0.5
			armStretch: 0.05
			legStretch: 0.05
			feetSpacing: 0
			globalScale: 1
			rootMotionBoneName:
			hasTranslationDoF: 0
			hasExtraRoot: 0
			skeletonHasParents: 1
			lastHumanDescriptionAvatarSource: {instanceID: 0}
			animationType: 0
			humanoidOversampling: 1
			additionalBone: 0
			userData:
			assetBundleName:
			assetBundleVariant:

	Assets/00000/package/Materials/Object_004_02.mat	2 ●●●●● patch \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Sequence_005_4X3_b.mat	2 ●●●●● patch \| view \| raw \| blame \| history
	Assets/00000/package/Model/dici.FBX	patch \| view \| raw \| blame \| history
	Assets/00000/package/Model/dici.FBX.meta	119 ●●●●● patch \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_Buff.prefab	24297 ●●●●● patch \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_Buff.prefab.meta	7 ●●●●● patch \| view \| raw \| blame \| history

			@@ -7,7 +7,7 @@
			m_CorrespondingSourceObject: {fileID: 0}
			m_PrefabInstance: {fileID: 0}
			m_PrefabAsset: {fileID: 0}
			m_Name: Object_004b
			m_Name: Object_004_02
			m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
			m_ShaderKeywords:
			m_LightmapFlags: 4

			@@ -7,7 +7,7 @@
			m_CorrespondingSourceObject: {fileID: 0}
			m_PrefabInstance: {fileID: 0}
			m_PrefabAsset: {fileID: 0}
			m_Name: Sequence_005_4X3 1
			m_Name: Sequence_005_4X3_b
			m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
			m_ShaderKeywords:
			m_LightmapFlags: 4

New file
			@@ -0,0 +1,7 @@
			fileFormatVersion: 2
			guid: 5480c96ebabda5a41a64d1dfa3a8165c
			PrefabImporter:
			externalObjects: {}
			userData:
			assetBundleName:
			assetBundleVariant:

New file
Diff too large