Merge branch 'master' of https://github.com/croakfang/UmaViewer
This commit is contained in:
-8
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b3e58808cb15120468eafdef64280407
|
||||
timeCreated: 1540224475
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
-7
@@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 59d63bcae2fecff42be7b4fc8b1df10f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
-7
@@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7d1083877b3838042b9e91b249731b89
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
-8
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0512c18ad5403428db876010796c1cda
|
||||
timeCreated: 1453118000
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
-7
@@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d00cc5f8e672c264d856aa10ed20df7e
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -572,7 +572,7 @@ public class UmaViewerUI : MonoBehaviour
|
||||
public void LoadMapPanel()
|
||||
{
|
||||
var pageentrys = new List<PageManager.Entry>();
|
||||
foreach (var scene in Main.AbList.Where(a => a.Name.StartsWith("3d/env") && Path.GetFileName(a.Name).StartsWith("pfb_")))
|
||||
foreach (var scene in Main.AbList.Where(a => ((a.Name.StartsWith("3d/env") && Path.GetFileName(a.Name).StartsWith("pfb_")) || a.Name.StartsWith("cutt/cutt_son") && Path.GetFileName(a.Name).StartsWith("cutt_son"))))
|
||||
{
|
||||
var pageentry = new PageManager.Entry();
|
||||
pageentry.Name = Path.GetFileName(scene.Name);
|
||||
@@ -711,7 +711,7 @@ public class UmaViewerUI : MonoBehaviour
|
||||
{
|
||||
var container = Instantiate(UmaContainerPrefab, LiveCharaSoundList.content).GetComponent<UmaUIContainer>();
|
||||
string[] split = Path.GetFileNameWithoutExtension(entry.Name).Split('_');
|
||||
string name = $"{ split[split.Length - 2]} {getCharaName(split[split.Length - 2])}";
|
||||
string name = $"{split[split.Length - 2]} {getCharaName(split[split.Length - 2])}";
|
||||
container.Name = name;
|
||||
|
||||
var icon = Main.Characters.Find(a => a.Id.ToString().Equals(split[split.Length - 2]));
|
||||
|
||||
+2
-1
@@ -1,5 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 57ddc43ace113674392034825a54600a
|
||||
guid: af3410625d37b4b46a660a23bb72b644
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
@@ -0,0 +1,22 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1953259897 &8574412962073106934
|
||||
TerrainLayer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: layer_Prototype Black3d3aba195e4d26ee
|
||||
m_DiffuseTexture: {fileID: 2800000, guid: c32a0b1f62ac42e4399935ffff09c099, type: 3}
|
||||
m_NormalMapTexture: {fileID: 0}
|
||||
m_MaskMapTexture: {fileID: 0}
|
||||
m_TileSize: {x: 15, y: 15}
|
||||
m_TileOffset: {x: 0, y: 0}
|
||||
m_Specular: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_Metallic: 0
|
||||
m_Smoothness: 0
|
||||
m_NormalScale: 1
|
||||
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
|
||||
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0f77a385a9aa0e94caecbb3613daed40
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8574412962073106934
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,22 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1953259897 &8574412962073106934
|
||||
TerrainLayer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: layer_Sand 118c7f28bcf2878ea
|
||||
m_DiffuseTexture: {fileID: 2800000, guid: b4ef8bb5ab02b47ddbc04f9ed0bcee7c, type: 3}
|
||||
m_NormalMapTexture: {fileID: 0}
|
||||
m_MaskMapTexture: {fileID: 0}
|
||||
m_TileSize: {x: 25, y: 25}
|
||||
m_TileOffset: {x: 0, y: 0}
|
||||
m_Specular: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_Metallic: 0
|
||||
m_Smoothness: 0
|
||||
m_NormalScale: 1
|
||||
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
|
||||
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c902541042b1bfc44b9e537ec3b6e8ef
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8574412962073106934
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,22 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1953259897 &8574412962073106934
|
||||
TerrainLayer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: layer_Sand 218c7f28bcf2878ea
|
||||
m_DiffuseTexture: {fileID: 2800000, guid: ac421e7b864c341f181a5d136ca4ed37, type: 3}
|
||||
m_NormalMapTexture: {fileID: 0}
|
||||
m_MaskMapTexture: {fileID: 0}
|
||||
m_TileSize: {x: 25, y: 25}
|
||||
m_TileOffset: {x: 0, y: 0}
|
||||
m_Specular: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_Metallic: 0
|
||||
m_Smoothness: 0
|
||||
m_NormalScale: 1
|
||||
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
|
||||
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 32d6c62772a64654f948ab55ca08af28
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8574412962073106934
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,22 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1953259897 &8574412962073106934
|
||||
TerrainLayer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: layer_Sand 33d3aba195e4d26ee
|
||||
m_DiffuseTexture: {fileID: 2800000, guid: a810c0e3b6ef7440a89a1ba1a931b299, type: 3}
|
||||
m_NormalMapTexture: {fileID: 0}
|
||||
m_MaskMapTexture: {fileID: 0}
|
||||
m_TileSize: {x: 15, y: 15}
|
||||
m_TileOffset: {x: 0, y: 0}
|
||||
m_Specular: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_Metallic: 0
|
||||
m_Smoothness: 0
|
||||
m_NormalScale: 1
|
||||
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
|
||||
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e3b80235f8ffc234b8468389e9302023
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8574412962073106934
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user