snxxz_client.git

少年修仙传客户端基础资源

parent: 17ff1d86 | 补丁 | 提交 | ignore whitespace

leonard Wu

2018-08-07 507634613ddd0fc03cec84c2359e4addf67ec99d

初始化版本库

(cherry picked from commit b21f859fe5c18e32f7a08818944e9ca355e29508)

# Conflicts:
#	Core/Common/ResourcesPath.cs
#	Core/Config/AssetSource.cs
#	Core/GameEngine/Model/ConfigManager.cs

2个文件已修改

1个文件已删除

2个文件已添加

	Assets/Art @ dc62a9	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Assets/Editor/Logo/android.meta	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Assets/Plugins/Android/libs/x86_64.meta~local.meta	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Assets/ResourcesOut @ d62827	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Assets/XLua.meta	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Assets/Art

@@ -1 +1 @@
Subproject commit 1c1b5a94dae93bc6ce8f3099fb261aa44704c4b9
Subproject commit dc62a901e95c8144b6e03eb5c513efdcb510c2f0

 Assets/Editor/Logo/android.meta

File was deleted

 Assets/Plugins/Android/libs/x86_64.meta~local.meta

New file
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1498753bee9c6fa4eacd315a8b1c4876
timeCreated: 1533622480
licenseType: Pro
DefaultImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/ResourcesOut

@@ -1 +1 @@
Subproject commit 0d50c2964315eaac280082b35a395cb8c73e63d5
Subproject commit d62827f4bf1f1ce610c90fc5601745bf2da4333d

 Assets/XLua.meta

New file
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6d2d240998b7a9a44b7402136c946623
folderAsset: yes
DefaultImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant:

			@@ -1 +1 @@
			Subproject commit 1c1b5a94dae93bc6ce8f3099fb261aa44704c4b9
			Subproject commit dc62a901e95c8144b6e03eb5c513efdcb510c2f0

New file
			@@ -0,0 +1,8 @@
			fileFormatVersion: 2
			guid: 1498753bee9c6fa4eacd315a8b1c4876
			timeCreated: 1533622480
			licenseType: Pro
			DefaultImporter:
			userData:
			assetBundleName:
			assetBundleVariant:

			@@ -1 +1 @@
			Subproject commit 0d50c2964315eaac280082b35a395cb8c73e63d5
			Subproject commit d62827f4bf1f1ce610c90fc5601745bf2da4333d

New file
			@@ -0,0 +1,7 @@
			fileFormatVersion: 2
			guid: 6d2d240998b7a9a44b7402136c946623
			folderAsset: yes
			DefaultImporter:
			userData:
			assetBundleName:
			assetBundleVariant: