snxxz_art.git - Gitblit

少年修仙传美术资源仓库

parent: 8646fbbb | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art into origin/...

art_dzg

2018-08-18 89ac1617feb91b3dab60e38ba51a13ad1ffd4729

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art into origin/master

2个文件已修改

1个文件已添加

	Role/M102/Effect/M102_fx_001.prefab	6605 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Role/M102/Effect/M102_fx_001.prefab.meta	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Role/M102/Effect/Model.meta	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Role/M102/Effect/M102_fx_001.prefab

Diff too large

 Role/M102/Effect/M102_fx_001.prefab.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 539184180f3f0844a858ed94d426bf39
timeCreated: 1516859231
timeCreated: 1534586509
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000

 Role/M102/Effect/Model.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 6bde4b47ab1f5b747bdff52dc2d20938
folderAsset: yes
timeCreated: 1534154343
licenseType: Pro
DefaultImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant:

			@@ -1,6 +1,6 @@
			fileFormatVersion: 2
			guid: 539184180f3f0844a858ed94d426bf39
			timeCreated: 1516859231
			timeCreated: 1534586509
			licenseType: Pro
			NativeFormatImporter:
			mainObjectFileID: 100100000

New file
			@@ -0,0 +1,9 @@
			fileFormatVersion: 2
			guid: 6bde4b47ab1f5b747bdff52dc2d20938
			folderAsset: yes
			timeCreated: 1534154343
			licenseType: Pro
			DefaultImporter:
			userData:
			assetBundleName:
			assetBundleVariant: