merge conflict

This commit is contained in:
CroakFang
2023-03-07 21:04:26 +08:00
7 changed files with 1496 additions and 135 deletions
+1417 -104
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -19,7 +19,7 @@ public class Screenshot : MonoBehaviour
public static void TakeScreenshot()
{
var camera = UmaViewerBuilder.Instance.AnimationCamera.gameObject.activeInHierarchy ? UmaViewerBuilder.Instance.AnimationCamera : Camera.main;
var camera = UmaViewerBuilder.Instance.AnimationCamera.GetComponent<Camera>().enabled ? UmaViewerBuilder.Instance.AnimationCamera : Camera.main;
int width = int.Parse(UmaViewerUI.Instance.SSWidth.text);
int height = int.Parse(UmaViewerUI.Instance.SSHeight.text);
width = width == -1 ? Screen.width : width;
@@ -46,7 +46,7 @@ public class Screenshot : MonoBehaviour
private IEnumerator RecordGif(int width, int height, bool transparent, int quality)
{
var camera = UmaViewerBuilder.Instance.AnimationCamera.gameObject.activeInHierarchy ? UmaViewerBuilder.Instance.AnimationCamera : Camera.main;
var camera = UmaViewerBuilder.Instance.AnimationCamera.GetComponent<Camera>().enabled ? UmaViewerBuilder.Instance.AnimationCamera : Camera.main;
var ppLayer = camera.GetComponent<PostProcessLayer>();
bool oldPpState = ppLayer.enabled;
ppLayer.enabled = false;
+19 -4
View File
@@ -34,7 +34,7 @@ public class UmaViewerMain : MonoBehaviour
{
Instance = this;
new Config();
Application.targetFrameRate = -1;
Application.targetFrameRate = 120;
AbList = UmaDatabaseController.Instance.MetaEntries.ToList();
AbChara = AbList.Where(ab => ab.Name.StartsWith(UmaDatabaseController.CharaPath)).ToList();
AbMotions = AbList.Where(ab => ab.Name.StartsWith(UmaDatabaseController.MotionPath)).ToList();
@@ -46,14 +46,15 @@ public class UmaViewerMain : MonoBehaviour
private IEnumerator Start()
{
Dictionary<int, string> enNames = new Dictionary<int, string>();
Dictionary<int, string> mobNames = new Dictionary<int, string>();
//Main chara names (En only)
if (Config.Instance.Language == Language.En)
{
yield return UmaViewerDownload.DownloadText("https://www.tracenacademy.com/api/BasicCharaDataInfo", txt =>
{
if (string.IsNullOrEmpty(txt)) return;
var umaData = JArray.Parse(txt);
foreach (var item in umaData)
foreach (var item in JArray.Parse(txt))
{
if (!enNames.ContainsKey((int)item["charaId"]))
{
@@ -62,6 +63,19 @@ public class UmaViewerMain : MonoBehaviour
}
});
}
//Mob names (EN & JP)
yield return UmaViewerDownload.DownloadText("https://www.tracenacademy.com/api/BasicMobDataInfo", txt =>
{
if (string.IsNullOrEmpty(txt)) return;
foreach (var item in JArray.Parse(txt))
{
if (!mobNames.ContainsKey((int)item["mobId"]))
{
mobNames.Add((int)item["mobId"], Config.Instance.Language == Language.Jp ? item["mobName"].ToString() : item["mobNameEnglish"].ToString());
}
}
});
var UmaCharaData = UmaDatabaseController.Instance.CharaData;
foreach (var item in UmaCharaData)
@@ -88,9 +102,10 @@ public class UmaViewerMain : MonoBehaviour
}
var id = Convert.ToInt32(item["mob_id"]);
var name = mobNames.ContainsKey(id) ? mobNames[id] : "";
MobCharacters.Add(new CharaEntry()
{
Name = $"Mob_{id}",
Name = string.IsNullOrEmpty(name)? $"Mob_{id}" : name,
Icon = UmaViewerBuilder.Instance.LoadMobCharaIcon(id.ToString()),
Id = id,
IsMob = true
+14 -3
View File
@@ -77,7 +77,7 @@ public class UmaViewerUI : MonoBehaviour
[Header("backgrounds")]
public ScrollRect BackGroundList;
public PageManager BackGroundPageCtrl;
public GameObject BackGroundCameraObj;
public GameObject BG_Canvas;
public GameObject BG_HSVPickerObj;
public Image BG_Image;
@@ -107,6 +107,7 @@ public class UmaViewerUI : MonoBehaviour
public Button VMDButton;
public Button UpdateDBButton;
public TMP_Dropdown WorkModeDropdown;
public TMP_Dropdown LanguageDropdown;
public List<GameObject> TogglablePanels = new List<GameObject>();
public List<GameObject> TogglableFacials = new List<GameObject>();
@@ -144,6 +145,7 @@ public class UmaViewerUI : MonoBehaviour
private void Start()
{
WorkModeDropdown.SetValueWithoutNotify((int)Config.Instance.WorkMode);
LanguageDropdown.SetValueWithoutNotify((int)Config.Instance.Language);
UpdateDBButton.interactable = (Config.Instance.WorkMode == WorkMode.Standalone);
}
@@ -963,7 +965,7 @@ public class UmaViewerUI : MonoBehaviour
Camera.main.clearFlags = CameraClearFlags.SolidColor;
break;
case 2:
Camera.main.clearFlags = CameraClearFlags.Depth;
Camera.main.clearFlags = CameraClearFlags.SolidColor;
ListBackgrounds();
break;
default:
@@ -971,8 +973,8 @@ public class UmaViewerUI : MonoBehaviour
break;
}
BackGroundCameraObj.SetActive(index == 2);
BG_HSVPickerObj.SetActive(index != 2);
BG_Canvas.SetActive(index == 2);
BackGroundPageCtrl.transform.parent.gameObject.SetActive(index == 2);
}
@@ -1215,6 +1217,15 @@ public class UmaViewerUI : MonoBehaviour
StartCoroutine(UpdateResVerCoroutine);
}
public void ChangeLanguage(int lang)
{
if ((int)Config.Instance.Language != lang)
{
Config.Instance.Language = (Language)lang;
Config.Instance.UpdateConfig();
}
}
public void ChangeWorkMode(int mode)
{
if ((int)Config.Instance.WorkMode != mode)
+1 -1
View File
@@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 2.1.6
bundleVersion: 2.1.7
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
+1 -1
View File
@@ -28,7 +28,7 @@ TagManager:
- O
- P
- Q
-
- Background
-
-
-
+42 -20
View File
@@ -2,26 +2,6 @@
Unity application that makes it easy to view assets from Uma Musume: Pretty Derby.
### Features
||||
| ------------ | ------------ | ------------ |
| ✓ - Working | / - Incomplete | x - Unsupported |
|||
| ------------ | ------------ |
| Viewing main character models/animations | ✓ |
| Swapping costumes/animations between characters | ✓ |
| Viewing chibi models/animations | ✓ |
| Playing facial animations, custom sliders | ✓ |
| Cloth/Hair physics | ✓ |
| Playing Live Audio with Lyrics | ✓ |
| Exporting animations to MMD | ✓ |
| Recording animations (.gif), screenshots | ✓ |
| Viewing Props, Scenery, Live scenes | / |
| Viewing mob (NPC) models | x |
| Exporting models | x |
### Requirements/Installation
- For Users:
1. [Uma Musume: Pretty Derby DMM](https://dmg.umamusume.jp/) with full data download is required to run the viewer.
@@ -47,5 +27,47 @@ Unity application that makes it easy to view assets from Uma Musume: Pretty Derb
1. Open the Assets/Scenes/Version2 scene.
- note: If there are errors in the console, [JSON .NET For Unity](https://assetstore.unity.com/packages/tools/input-management/json-net-for-unity-11347) may be required
### Features
||||
| ------------ | ------------ | ------------ |
| ✓ - Working | / - Incomplete | x - Unsupported |
|||
| ------------ | ------------ |
| Viewing main character models/animations | ✓ |
| Swapping costumes/animations between characters | ✓ |
| Viewing chibi models/animations | ✓ |
| Viewing mob (NPC) models | ✓ |
| Playing facial animations, custom sliders | ✓ |
| Cloth/Hair physics | ✓ |
| Playing Live Audio with Lyrics | ✓ |
| Exporting animations to MMD | ✓ |
| Recording animations (.gif), screenshots | ✓ |
| Viewing Props, Scenery, Live scenes | / |
| Exporting models | x |
All characters and animations are supported
<img src="https://user-images.githubusercontent.com/59540382/222418271-a6e4ce82-b3a5-47ba-9fc9-4d85120218ec.png" height="350" />
Mobs / background characters as well
<img src="https://user-images.githubusercontent.com/32562737/219174232-7d0a0eec-8b1c-4571-9c08-8474e06dd3a8.png" height="350" />
Mixing outfits and animations
<img src="https://user-images.githubusercontent.com/59540382/222420757-609e1f77-d762-4b39-a7d0-d1fb2d3b79a3.png" height="350" />
Screenshot and .gif recording
<img src="https://user-images.githubusercontent.com/59540382/222421579-582be5db-5839-4f7c-bf1b-80efc812c4e0.gif" height="350" />
and more
<img src="https://user-images.githubusercontent.com/59540382/222422871-12e80e0b-778b-4f42-b581-5e4af5cd6df9.png" height="350" />
### Special Thank to:
MarshmallowAndroid: [UmaMusumeExplorer](https://github.com/MarshmallowAndroid/UmaMusumeExplorer) for acb/awb decoder.