Add custom head, live character shader control, and live stage control. (#88)
* Bug fix, improved UI layout and live vocals * Bug Fixes, New Live Compatibility * Android build support * Update build.yml * Update build.yml * Update build.yml * Update build.yml * Update build.yml * Update build.yml * Fix issues with the new version of the game * bug fix * add config button * Improve performance * Sync fork * bug fix, new uma compatibility * Add /UserSettings to gitignore * bug fix, add live characher shader control * fix compilation errors * fix compilation errors 2 * fix the live lighting calculation logic * bug fix, add editor layout settings to gitignore * bug fix, add editor layout settings to gitignore * Add time scale keys for live * live camera bug fix * add live stage control, optimize live performance * fix build error * add uma head custom
This commit is contained in:
+4
-1
@@ -2,6 +2,7 @@
|
||||
#
|
||||
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
|
||||
#
|
||||
.utmp/
|
||||
/[Ll]ibrary/
|
||||
/[Tt]emp/
|
||||
/[Oo]bj/
|
||||
@@ -12,6 +13,8 @@
|
||||
/Assets/AmplifyShaderEditor/
|
||||
/Ignore/
|
||||
/Screenshots/
|
||||
/[Uu]ser[Ss]ettings/
|
||||
*.log
|
||||
|
||||
# Asset meta data should only be ignored when the corresponding asset is also ignored
|
||||
!/[Aa]ssets/**/*.meta
|
||||
@@ -63,10 +66,10 @@ crashlytics-build.properties
|
||||
|
||||
/Assets/Plugins/RootMotion/PuppetMaster/_Integration
|
||||
/VMDRecords
|
||||
/umamusume
|
||||
Config.json
|
||||
/gltf
|
||||
/Assets/Plugins/RootMotion/FinalIK/_Integration
|
||||
/Poses
|
||||
/Assets/AmplifyShaderEditor.meta
|
||||
/BuildDev
|
||||
/UserSettings/Layouts/default-2022.dwlt
|
||||
|
||||
@@ -242,24 +242,44 @@ namespace RootMotion.Dynamics {
|
||||
|
||||
// Returns the Muscle.Group of the specified bone Transform (only if using the Humanoid rig)
|
||||
private static Muscle.Group FindGroup(Animator animator, Transform t) {
|
||||
if (!animator.isHuman) return Muscle.Group.Hips;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.Chest)) return Muscle.Group.Spine;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.Head)) return Muscle.Group.Head;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.Hips)) return Muscle.Group.Hips;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.LeftFoot)) return Muscle.Group.Foot;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.LeftHand)) return Muscle.Group.Hand;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.LeftLowerArm)) return Muscle.Group.Arm;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.LeftLowerLeg)) return Muscle.Group.Leg;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.LeftUpperArm)) return Muscle.Group.Arm;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.LeftUpperLeg)) return Muscle.Group.Leg;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.RightFoot)) return Muscle.Group.Foot;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.RightHand)) return Muscle.Group.Hand;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.RightLowerArm)) return Muscle.Group.Arm;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.RightLowerLeg)) return Muscle.Group.Leg;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.RightUpperArm)) return Muscle.Group.Arm;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.RightUpperLeg)) return Muscle.Group.Leg;
|
||||
return Muscle.Group.Spine;
|
||||
}
|
||||
if (animator.isHuman) {
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.Chest)) return Muscle.Group.Spine;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.Head)) return Muscle.Group.Head;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.Hips)) return Muscle.Group.Hips;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.LeftFoot)) return Muscle.Group.Foot;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.LeftHand)) return Muscle.Group.Hand;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.LeftLowerArm)) return Muscle.Group.Arm;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.LeftLowerLeg)) return Muscle.Group.Leg;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.LeftUpperArm)) return Muscle.Group.Arm;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.LeftUpperLeg)) return Muscle.Group.Leg;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.RightFoot)) return Muscle.Group.Foot;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.RightHand)) return Muscle.Group.Hand;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.RightLowerArm)) return Muscle.Group.Arm;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.RightLowerLeg)) return Muscle.Group.Leg;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.RightUpperArm)) return Muscle.Group.Arm;
|
||||
if (t == animator.GetBoneTransform(HumanBodyBones.RightUpperLeg)) return Muscle.Group.Leg;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (t.name.Equals("Hip")) return Muscle.Group.Hips;
|
||||
if (t.name.Equals("Spine")) return Muscle.Group.Spine;
|
||||
if (t.name.Equals("Chest")) return Muscle.Group.Spine;
|
||||
if (t.name.Equals("Head")) return Muscle.Group.Head;
|
||||
if (t.name.Equals("Arm_L")) return Muscle.Group.Arm;
|
||||
if (t.name.Equals("Elbow_L")) return Muscle.Group.Arm;
|
||||
if (t.name.Equals("Wrist_L")) return Muscle.Group.Hand;
|
||||
if (t.name.Equals("Arm_R")) return Muscle.Group.Arm;
|
||||
if (t.name.Equals("Elbow_R")) return Muscle.Group.Arm;
|
||||
if (t.name.Equals("Wrist_R")) return Muscle.Group.Hand;
|
||||
if (t.name.Equals("Thigh_L")) return Muscle.Group.Leg;
|
||||
if (t.name.Equals("Knee_L")) return Muscle.Group.Leg;
|
||||
if (t.name.Equals("Ankle_L")) return Muscle.Group.Foot;
|
||||
if (t.name.Equals("Thigh_R")) return Muscle.Group.Leg;
|
||||
if (t.name.Equals("Knee_R")) return Muscle.Group.Leg;
|
||||
if (t.name.Equals("Ankle_R")) return Muscle.Group.Foot;
|
||||
}
|
||||
return Muscle.Group.Spine;
|
||||
}
|
||||
|
||||
// Removes all bones that don't have a Rigidbody or a Collider attached because they are not part of the simulation
|
||||
private void RemoveUnnecessaryBones() {
|
||||
|
||||
@@ -211,36 +211,44 @@ namespace RootMotion.Dynamics {
|
||||
public static BipedRagdollReferences FromAvatar(Animator animator) {
|
||||
BipedRagdollReferences r = new BipedRagdollReferences();
|
||||
|
||||
if (!animator.isHuman) {
|
||||
List<Transform> list = new List<Transform>(animator.gameObject.GetComponentsInChildren<Transform>());
|
||||
list.Find(t => t.name.Equals("Position"));
|
||||
if (!animator.isHuman)
|
||||
{
|
||||
Dictionary<string, Transform> transformDict = new Dictionary<string, Transform>();
|
||||
foreach (Transform t in animator.gameObject.GetComponentsInChildren<Transform>())
|
||||
{
|
||||
if(!transformDict.ContainsKey(t.name))
|
||||
{
|
||||
transformDict[t.name] = t;
|
||||
}
|
||||
}
|
||||
|
||||
r.root = list.Find(t => t.name.Equals("Position"));
|
||||
r.root = transformDict.ContainsKey("Position") ? transformDict["Position"] : null;
|
||||
|
||||
r.hips = list.Find(t => t.name.Equals("Hip"));
|
||||
r.spine = list.Find(t => t.name.Equals("Spine"));
|
||||
r.chest = list.Find(t => t.name.Equals("Chest"));
|
||||
r.head = list.Find(t => t.name.Equals("Head"));
|
||||
r.hips = transformDict.ContainsKey("Hip") ? transformDict["Hip"] : null;
|
||||
r.spine = transformDict.ContainsKey("Spine") ? transformDict["Spine"] : null;
|
||||
r.chest = transformDict.ContainsKey("Chest") ? transformDict["Chest"] : null;
|
||||
r.head = transformDict.ContainsKey("Head") ? transformDict["Head"] : null;
|
||||
|
||||
r.leftUpperArm = list.Find(t => t.name.Equals("Arm_L"));
|
||||
r.leftLowerArm = list.Find(t => t.name.Equals("Elbow_L"));
|
||||
r.leftHand = list.Find(t => t.name.Equals("Wrist_L"));
|
||||
r.leftUpperArm = transformDict.ContainsKey("Arm_L") ? transformDict["Arm_L"] : null;
|
||||
r.leftLowerArm = transformDict.ContainsKey("Elbow_L") ? transformDict["Elbow_L"] : null;
|
||||
r.leftHand = transformDict.ContainsKey("Wrist_L") ? transformDict["Wrist_L"] : null;
|
||||
|
||||
r.rightUpperArm = list.Find(t => t.name.Equals("Arm_R"));
|
||||
r.rightLowerArm = list.Find(t => t.name.Equals("Elbow_R"));
|
||||
r.rightHand = list.Find(t => t.name.Equals("Wrist_R"));
|
||||
r.rightUpperArm = transformDict.ContainsKey("Arm_R") ? transformDict["Arm_R"] : null;
|
||||
r.rightLowerArm = transformDict.ContainsKey("Elbow_R") ? transformDict["Elbow_R"] : null;
|
||||
r.rightHand = transformDict.ContainsKey("Wrist_R") ? transformDict["Wrist_R"] : null;
|
||||
|
||||
r.leftUpperLeg = list.Find(t => t.name.Equals("Thigh_L"));
|
||||
r.leftLowerLeg = list.Find(t => t.name.Equals("Knee_L"));
|
||||
r.leftFoot = list.Find(t => t.name.Equals("Ankle_L"));
|
||||
r.leftUpperLeg = transformDict.ContainsKey("Thigh_L") ? transformDict["Thigh_L"] : null;
|
||||
r.leftLowerLeg = transformDict.ContainsKey("Knee_L") ? transformDict["Knee_L"] : null;
|
||||
r.leftFoot = transformDict.ContainsKey("Ankle_L") ? transformDict["Ankle_L"] : null;
|
||||
|
||||
r.rightUpperLeg = list.Find(t => t.name.Equals("Thigh_R"));
|
||||
r.rightLowerLeg = list.Find(t => t.name.Equals("Knee_R"));
|
||||
r.rightFoot = list.Find(t => t.name.Equals("Ankle_R"));
|
||||
return r;
|
||||
}
|
||||
r.rightUpperLeg = transformDict.ContainsKey("Thigh_R") ? transformDict["Thigh_R"] : null;
|
||||
r.rightLowerLeg = transformDict.ContainsKey("Knee_R") ? transformDict["Knee_R"] : null;
|
||||
r.rightFoot = transformDict.ContainsKey("Ankle_R") ? transformDict["Ankle_R"] : null;
|
||||
|
||||
r.root = animator.transform;
|
||||
return r;
|
||||
}
|
||||
|
||||
r.root = animator.transform;
|
||||
|
||||
r.hips = animator.GetBoneTransform(HumanBodyBones.Hips);
|
||||
r.spine = animator.GetBoneTransform(HumanBodyBones.Spine);
|
||||
|
||||
+805
-21
File diff suppressed because it is too large
Load Diff
@@ -5,6 +5,7 @@ public class LiveCharacterSelect : MonoBehaviour
|
||||
{
|
||||
public CharaEntry CharaEntry;
|
||||
public string CostumeId;
|
||||
public string HeadCostumeId;
|
||||
public Image CharaImage;
|
||||
public Image CostumeImage;
|
||||
public Text IndexText;
|
||||
@@ -17,10 +18,11 @@ public class LiveCharacterSelect : MonoBehaviour
|
||||
ui.ToggleUIPanel(ui.SelectCharacterPannel);
|
||||
}
|
||||
|
||||
public void SetValue(CharaEntry charaentry, string costumeId, Sprite costumeSprite)
|
||||
public void SetValue(CharaEntry charaentry, string costumeId, Sprite costumeSprite, string headCostumeId)
|
||||
{
|
||||
CharaEntry = charaentry;
|
||||
CostumeId = costumeId;
|
||||
HeadCostumeId = headCostumeId;
|
||||
CharaImage.enabled = true;
|
||||
CharaImage.sprite = charaentry.Icon;
|
||||
CostumeImage.sprite = costumeSprite;
|
||||
|
||||
@@ -66,5 +66,6 @@ public class UmaUIContainer : MonoBehaviour
|
||||
public Toggle Toggle;
|
||||
public Image Image;
|
||||
public Image ToggleImage;
|
||||
public string Id;
|
||||
}
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@ public class UmaContainer : MonoBehaviour
|
||||
public CharaShaderEffectData HeadShaderEffectData;
|
||||
public CharaShaderEffectData BodyShaderEffectData;
|
||||
public List<MaterialHelper> Materials = new List<MaterialHelper>();
|
||||
public List<Renderer> Renderers = new List<Renderer>();
|
||||
|
||||
protected UmaViewerBuilder Builder => UmaViewerBuilder.Instance;
|
||||
protected UmaViewerMain Main => UmaViewerMain.Instance;
|
||||
|
||||
@@ -170,7 +170,8 @@ public class UmaContainerCharacter : UmaContainer
|
||||
UmaAnimator.runtimeAnimatorController = OverrideController;
|
||||
|
||||
//Materials
|
||||
foreach (var rend in gameObject.GetComponentsInChildren<Renderer>())
|
||||
Renderers = gameObject.GetComponentsInChildren<Renderer>().ToList();
|
||||
foreach (var rend in Renderers)
|
||||
{
|
||||
for (int i = 0; i < rend.sharedMaterials.Length; i++)
|
||||
{
|
||||
@@ -458,6 +459,7 @@ public class UmaContainerCharacter : UmaContainer
|
||||
var animator = UmaAnimator;
|
||||
BipedRagdollReferences r = BipedRagdollReferences.FromAvatar(animator);
|
||||
BipedRagdollCreator.Options options = BipedRagdollCreator.AutodetectOptions(r);
|
||||
options.spine = true;
|
||||
|
||||
var ik = container.gameObject.AddComponent<BipedIK>();
|
||||
ik.references.root = container.transform;
|
||||
|
||||
@@ -180,7 +180,8 @@ public enum UmaFileType
|
||||
teambuilding,
|
||||
challengematch,
|
||||
collectevent,
|
||||
ratingrace
|
||||
ratingrace,
|
||||
jobs
|
||||
}
|
||||
|
||||
public enum TranslationTables
|
||||
|
||||
@@ -25,6 +25,8 @@ public class UmaDatabaseController
|
||||
}
|
||||
/// <summary> 3d/chara/body/ </summary>
|
||||
public static string BodyPath = "3d/chara/body/";
|
||||
/// <summary> 3d/chara/mini/body/ </summary>
|
||||
public static string MiniBodyPath = "3d/chara/mini/body/";
|
||||
/// <summary> 3d/chara/head/ </summary>
|
||||
public static string HeadPath = "3d/chara/head/";
|
||||
/// <summary> 3d/motion/ </summary>
|
||||
|
||||
@@ -45,7 +45,7 @@ public class UmaViewerBuilder : MonoBehaviour
|
||||
Instance = this;
|
||||
}
|
||||
|
||||
public IEnumerator LoadUma(CharaEntry chara, string costumeId, bool mini)
|
||||
public IEnumerator LoadUma(CharaEntry chara, string costumeId, bool mini, string haedCostumeId = "")
|
||||
{
|
||||
int id = chara.Id;
|
||||
var umaContainer = new GameObject($"Chara_{id}_{costumeId}").AddComponent<UmaContainerCharacter>();
|
||||
@@ -69,7 +69,7 @@ public class UmaViewerBuilder : MonoBehaviour
|
||||
else
|
||||
{
|
||||
umaContainer.CharaData = UmaDatabaseController.ReadCharaData(chara);
|
||||
LoadNormalUma(umaContainer, chara, costumeId, true);
|
||||
LoadNormalUma(umaContainer, chara, costumeId, true, haedCostumeId);
|
||||
}
|
||||
|
||||
yield break;
|
||||
@@ -94,7 +94,7 @@ public class UmaViewerBuilder : MonoBehaviour
|
||||
}
|
||||
else
|
||||
{
|
||||
LoadNormalUma(umaContainer, characters[i].CharaEntry, characters[i].CostumeId);
|
||||
LoadNormalUma(umaContainer, characters[i].CharaEntry, characters[i].CostumeId, false, characters[i].HeadCostumeId);
|
||||
}
|
||||
|
||||
Gallop.Live.Director.instance.CharaContainerScript.Add(umaContainer);
|
||||
@@ -102,7 +102,7 @@ public class UmaViewerBuilder : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
private void LoadNormalUma(UmaContainerCharacter umaContainer, CharaEntry chara, string costumeId, bool loadMotion = false)
|
||||
private void LoadNormalUma(UmaContainerCharacter umaContainer, CharaEntry chara, string costumeId, bool loadMotion = false, string haedCostumeId = "")
|
||||
{
|
||||
int id = chara.Id;
|
||||
umaContainer.CharaEntry = chara;
|
||||
@@ -117,11 +117,12 @@ public class UmaViewerBuilder : MonoBehaviour
|
||||
shape = charaData["shape"].ToString();
|
||||
|
||||
UmaDatabaseEntry asset = null;
|
||||
|
||||
umaContainer.VarCostumeIdLong = costumeId;
|
||||
if (genericCostume)
|
||||
{
|
||||
costumeIdShort = costumeId.Remove(costumeId.LastIndexOf('_'));
|
||||
umaContainer.VarCostumeIdShort = costumeIdShort;
|
||||
umaContainer.VarCostumeIdLong = costumeId;
|
||||
umaContainer.VarBust = bust;
|
||||
umaContainer.VarSkin = skin;
|
||||
umaContainer.VarSocks = socks;
|
||||
@@ -218,12 +219,12 @@ public class UmaViewerBuilder : MonoBehaviour
|
||||
else
|
||||
{
|
||||
head_id = id;
|
||||
head_costumeId = costumeId;
|
||||
head_costumeId = string.IsNullOrEmpty(haedCostumeId) ? costumeId : haedCostumeId;
|
||||
|
||||
CurrentHead = new UmaHeadData
|
||||
{
|
||||
id = id,
|
||||
costumeId = costumeId,
|
||||
costumeId = head_costumeId,
|
||||
tailId = tailId,
|
||||
chara = chara
|
||||
};
|
||||
|
||||
@@ -30,6 +30,7 @@ public class UmaViewerUI : MonoBehaviour
|
||||
public ScrollRect MobCharactersList;
|
||||
public PageManager MobCharactersPageCtrl;
|
||||
public ScrollRect CostumeList;
|
||||
public ScrollRect HeadCostumeList;
|
||||
public ScrollRect MobCostumeList;
|
||||
public ScrollRect AnimationSetList;
|
||||
public ScrollRect AnimationList;
|
||||
@@ -143,6 +144,7 @@ public class UmaViewerUI : MonoBehaviour
|
||||
public bool DynamicBoneEnable = true;
|
||||
public bool EnableEyeTracking = true;
|
||||
public bool EnableFaceOverride = true;
|
||||
public string CurrentHeadCostumeId = string.Empty;
|
||||
|
||||
[Header("Live")]
|
||||
public bool LiveTime = false;
|
||||
@@ -717,20 +719,22 @@ public class UmaViewerUI : MonoBehaviour
|
||||
Action<CharaEntry> action = delegate (CharaEntry achara)
|
||||
{
|
||||
string nameVar = mini ? $"pfb_mbdy{achara.Id}" : $"pfb_bdy{achara.Id}";
|
||||
foreach (var entry in Main.AbList.Where(a => !a.Key.Contains("clothes") && a.Key.Contains(nameVar)))
|
||||
string bodyPath = mini ? UmaDatabaseController.MiniBodyPath : UmaDatabaseController.BodyPath;
|
||||
foreach (var entry in Main.AbChara.Where(a => a.Name.StartsWith(bodyPath) && !a.Name.Contains("clothes") && a.Name.Contains(nameVar)))
|
||||
{
|
||||
var container = Instantiate(UmaContainerCostumePrefab, costumeList.content).GetComponent<UmaUIContainer>();
|
||||
string[] split = entry.Key.Split('_');
|
||||
string[] split = entry.Name.Split('_');
|
||||
string costumeId = split[split.Length - 1];
|
||||
var dressdata = Main.Costumes.FirstOrDefault(a => (a.CharaId == achara.Id && a.BodyTypeSub == int.Parse(costumeId)));
|
||||
container.Name = container.name = GetCostumeName(costumeId, (dressdata == null ? costumeId : dressdata.DressName));
|
||||
container.Image.sprite = (dressdata == null ? CostumeIconDefault : dressdata.Icon);
|
||||
container.Image.enabled = true;
|
||||
container.Id = costumeId;
|
||||
container.Button.onClick.AddListener(() =>
|
||||
{
|
||||
if (LiveSelectPannel.activeInHierarchy && CurrentSeletChara)
|
||||
{
|
||||
CurrentSeletChara.SetValue(achara, costumeId, container.Image.sprite);
|
||||
CurrentSeletChara.SetValue(achara, costumeId, container.Image.sprite, CurrentHeadCostumeId);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -745,7 +749,7 @@ public class UmaViewerUI : MonoBehaviour
|
||||
Builder.UnloadUma();
|
||||
//UmaAssetManager.UnloadAllBundle(true);
|
||||
UmaAssetManager.PreLoadAndRun(list , delegate {
|
||||
StartCoroutine(Builder.LoadUma(achara, costumeId, mini));
|
||||
StartCoroutine(Builder.LoadUma(achara, costumeId, mini, CurrentHeadCostumeId));
|
||||
});
|
||||
//StartCoroutine(Builder.LoadUma(achara, costumeId, mini));
|
||||
}
|
||||
@@ -761,7 +765,8 @@ public class UmaViewerUI : MonoBehaviour
|
||||
//Common costumes
|
||||
List<string> costumes = new List<string>();
|
||||
var nameVar = mini ? "pfb_mbdy0" : $"pfb_bdy0";
|
||||
foreach (var entry in Main.AbChara.Where(a => a.Name.Contains("/body/") && !a.Name.Contains("/clothes/") && a.Name.Contains(nameVar)))
|
||||
string bodyPath = mini ? UmaDatabaseController.MiniBodyPath : UmaDatabaseController.BodyPath;
|
||||
foreach (var entry in Main.AbChara.Where(a => a.Name.StartsWith(bodyPath) && !a.Name.Contains("/clothes/") && a.Name.Contains(nameVar)))
|
||||
{
|
||||
string id = Path.GetFileName(entry.Name);
|
||||
string[] split = id.Split('_');
|
||||
@@ -780,11 +785,12 @@ public class UmaViewerUI : MonoBehaviour
|
||||
container.Name = container.name = GetCostumeName(id, (dressdata == null ? id : dressdata.DressName));
|
||||
container.Image.sprite = (dressdata == null ? CostumeIconDefault : dressdata.Icon);
|
||||
container.Image.enabled = true;
|
||||
container.Id = costumeId;
|
||||
container.Button.onClick.AddListener(() =>
|
||||
{
|
||||
if (LiveSelectPannel.activeInHierarchy && CurrentSeletChara)
|
||||
{
|
||||
CurrentSeletChara.SetValue(chara, costumeId, container.Image.sprite);
|
||||
CurrentSeletChara.SetValue(chara, costumeId, container.Image.sprite, CurrentHeadCostumeId);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -802,12 +808,65 @@ public class UmaViewerUI : MonoBehaviour
|
||||
|
||||
Builder.UnloadUma();
|
||||
//UmaAssetManager.UnloadAllBundle(true);
|
||||
UmaAssetManager.PreLoadAndRun(list, delegate { StartCoroutine(Builder.LoadUma(chara, costumeId, mini)); });
|
||||
UmaAssetManager.PreLoadAndRun(list, delegate { StartCoroutine(Builder.LoadUma(chara, costumeId, mini, CurrentHeadCostumeId)); });
|
||||
//StartCoroutine(Builder.LoadUma(achara, costumeId, mini));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if(!chara.IsMob && !mini)
|
||||
{
|
||||
for (int i = HeadCostumeList.content.childCount - 1; i >= 0; i--)
|
||||
{
|
||||
Destroy(HeadCostumeList.content.GetChild(i).gameObject);
|
||||
}
|
||||
CurrentHeadCostumeId = string.Empty;
|
||||
nameVar = $"/pfb_chr{chara.Id}_";
|
||||
foreach (var entry in Main.AbChara.Where(a => a.Name.StartsWith($"{UmaDatabaseController.HeadPath}chr{chara.Id}_") && !a.Name.Contains("clothes") && a.Name.Contains(nameVar)))
|
||||
{
|
||||
var container = Instantiate(UmaContainerCostumePrefab, HeadCostumeList.content).GetComponent<UmaUIContainer>();
|
||||
string[] split = entry.Name.Split('_');
|
||||
string head_costumeId = split[split.Length - 1];
|
||||
var dressdata = Main.Costumes.FirstOrDefault(a => (a.CharaId == chara.Id && a.BodyTypeSub == int.Parse(head_costumeId)));
|
||||
container.Name = container.name = GetCostumeName(head_costumeId, (dressdata == null ? head_costumeId : dressdata.DressName));
|
||||
container.Image.sprite = (dressdata == null ? CostumeIconDefault : dressdata.Icon);
|
||||
container.Image.enabled = true;
|
||||
container.Id = head_costumeId;
|
||||
container.Button.onClick.AddListener(() =>
|
||||
{
|
||||
CurrentHeadCostumeId = head_costumeId;
|
||||
if (!LiveSelectPannel.activeInHierarchy || !CurrentSeletChara)
|
||||
{
|
||||
HighlightChildImage(HeadCostumeList.content, container);
|
||||
}
|
||||
bool hasBreak = false;
|
||||
foreach (var t in CostumeList.GetComponentsInChildren<UmaUIContainer>())
|
||||
{
|
||||
if (t.ToggleImage.enabled)
|
||||
{
|
||||
hasBreak = true;
|
||||
t.Button.onClick.Invoke();
|
||||
break;
|
||||
}
|
||||
else if(CurrentSeletChara && CurrentSeletChara.CostumeId == t.Id)
|
||||
{
|
||||
hasBreak = true;
|
||||
t.Button.onClick.Invoke();
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!hasBreak)
|
||||
{
|
||||
//if no costume selected, select first costume
|
||||
if (CostumeList.content.childCount > 0)
|
||||
{
|
||||
CostumeList.content.GetChild(0).GetComponent<UmaUIContainer>().Button.onClick.Invoke();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ListLiveSounds(int songid)
|
||||
|
||||
@@ -927,7 +927,7 @@ namespace Gallop
|
||||
foreach (var part in updateInfo_.mouthPrev.facialPartsDataArray)
|
||||
{
|
||||
if (part.FacialPartsId == 0) { continue; }
|
||||
MouthMorphs[part.FacialPartsId - 1].weight = ((float)part.WeightPer / 100 * (1 - weightRatio)) * ((float)updateInfo_.mouthPrev.weight / 100);
|
||||
MouthMorphs[part.FacialPartsId - 1].weight = ((float)part.WeightPer / 100 * (1 - weightRatio));
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -943,7 +943,7 @@ namespace Gallop
|
||||
foreach (var part in updateInfo_.mouthCur.facialPartsDataArray)
|
||||
{
|
||||
if (part.FacialPartsId == 0) { continue; }
|
||||
MouthMorphs[part.FacialPartsId - 1].weight += ((float)part.WeightPer / 100 * weightRatio) * ((float)updateInfo_.mouthCur.weight / 100);
|
||||
MouthMorphs[part.FacialPartsId - 1].weight += ((float)part.WeightPer / 100 * weightRatio);
|
||||
}
|
||||
|
||||
ChangeMorphMouth();
|
||||
|
||||
@@ -61,7 +61,7 @@ namespace Gallop.Live.Cutt
|
||||
float num = 1f - t;
|
||||
float num2 = t * t * t * t;
|
||||
float num3 = 4f * t * t * t * num;
|
||||
float num4 = 4f * t * t * num * num;
|
||||
float num4 = 6f * t * t * num * num;
|
||||
float num5 = 4f * t * num * num * num;
|
||||
float num6 = num * num * num * num;
|
||||
v3.x = num2 * end.x + num3 * cp3.x + num4 * cp2.x + num5 * cp1.x + num6 * start.x;
|
||||
@@ -74,8 +74,8 @@ namespace Gallop.Live.Cutt
|
||||
float num = 1f - t;
|
||||
float num2 = t * t * t * t * t;
|
||||
float num3 = 5f * t * t * t * t * num;
|
||||
float num4 = 5f * t * t * t * num * num;
|
||||
float num5 = 5f * t * t * num * num * num;
|
||||
float num4 = 10f * t * t * t * num * num;
|
||||
float num5 = 10f * t * t * num * num * num;
|
||||
float num6 = 5f * t * num * num * num * num;
|
||||
float num7 = num * num * num * num * num;
|
||||
v3.x = num2 * end.x + num3 * cp4.x + num4 * cp3.x + num5 * cp2.x + num6 * cp1.x + num7 * start.x;
|
||||
|
||||
@@ -13,6 +13,8 @@ namespace Gallop.Live.Cutt
|
||||
|
||||
public Dictionary<string, Transform> Bones;
|
||||
|
||||
private LiveCharaPosition _liveCharaStandingPosition;
|
||||
|
||||
public LiveTimelineCharaLocator(UmaContainerCharacter umaContainer)
|
||||
{
|
||||
UmaContainer = umaContainer;
|
||||
@@ -36,7 +38,7 @@ namespace Gallop.Live.Cutt
|
||||
|
||||
public bool liveCharaVisible { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
|
||||
|
||||
public LiveCharaPosition liveCharaStandingPosition { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
|
||||
public LiveCharaPosition liveCharaStandingPosition { get => _liveCharaStandingPosition; set => _liveCharaStandingPosition = value; }
|
||||
|
||||
public Vector3 liveCharaInitialPosition { get => _liveCharaInitialPosition; set => _liveCharaInitialPosition = value; }
|
||||
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using static RootMotion.FinalIK.IKSolverVR;
|
||||
using System.Linq;
|
||||
using System.IO;
|
||||
using static Gallop.Live.Cutt.LiveTimelineDefine;
|
||||
|
||||
namespace Gallop.Live.Cutt
|
||||
{
|
||||
@@ -55,6 +52,16 @@ namespace Gallop.Live.Cutt
|
||||
|
||||
public event Action<int> OnUpdateCameraSwitcher;
|
||||
|
||||
public event GlobalLightUpdateInfoDelegate OnUpdateGlobalLight;
|
||||
|
||||
public event BgColor1UpdateInfoDelegate OnUpdateBgColor1;
|
||||
|
||||
public event BgColor2UpdateInfoDelegate OnUpdateBgColor2;
|
||||
|
||||
public event TransformUpdateInfoDelegate OnUpdateTransform;
|
||||
|
||||
public event ObjectUpdateInfoDelegate OnUpdateObject;
|
||||
|
||||
private static Func<LiveTimelineKeyCameraPositionData, LiveTimelineControl, FindTimelineConfig, Vector3> fnGetCameraPosValue = GetCameraPosValue;
|
||||
|
||||
private static Func<LiveTimelineKeyCameraLookAtData, LiveTimelineControl, Vector3, FindTimelineConfig, Vector3> fnGetCameraLookAtValue = GetCameraLookAtValue;
|
||||
@@ -100,6 +107,8 @@ namespace Gallop.Live.Cutt
|
||||
public List<List<LiveCameraFrame>> MultiRecordFrames = new List<List<LiveCameraFrame>>();
|
||||
public event Action RecordUma;
|
||||
|
||||
public Dictionary<string, GameObject> StageObjectMap = new Dictionary<string, GameObject>();
|
||||
|
||||
public float currentLiveTime
|
||||
{
|
||||
get
|
||||
@@ -328,6 +337,11 @@ namespace Gallop.Live.Cutt
|
||||
AlterUpdate_CameraFov(workSheet, _currentFrame);
|
||||
AlterUpdate_CameraRoll(workSheet, _currentFrame);
|
||||
AlterUpdate_MultiCamera(workSheet, _currentFrame);
|
||||
AlterUpdate_GlobalLight(workSheet, _currentFrame);
|
||||
AlterUpdate_BgColor1(workSheet, _currentFrame);
|
||||
AlterUpdate_TransformControl(workSheet, _currentFrame);
|
||||
AlterUpdate_ObjectControl(workSheet, _currentFrame);
|
||||
|
||||
_isNowAlterUpdate = false;
|
||||
|
||||
if (IsRecordVMD)
|
||||
@@ -362,7 +376,7 @@ namespace Gallop.Live.Cutt
|
||||
{
|
||||
foreach (var motion in _motionSequenceArray)
|
||||
{
|
||||
motion.AlterUpdate(liveTime);
|
||||
motion.AlterUpdate(liveTime, data.worksheetList[0].timescaleKeys);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -626,7 +640,23 @@ namespace Gallop.Live.Cutt
|
||||
|
||||
if (curKey.visible || IsRecordVMD)
|
||||
{
|
||||
if(nextKey != null && nextKey.interpolateType != LiveCameraInterpolateType.None)
|
||||
if (!string.IsNullOrEmpty(curKey.ParentObjectName))
|
||||
{
|
||||
var parent_transform = curKey.GetParentObjectTransform(this);
|
||||
if (parent_transform)
|
||||
{
|
||||
if (chara.transform.parent != parent_transform)
|
||||
{
|
||||
chara.transform.SetParent(parent_transform);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (chara.transform.parent)
|
||||
{
|
||||
chara.transform.SetParent(null);
|
||||
}
|
||||
|
||||
if (nextKey != null && nextKey.interpolateType != LiveCameraInterpolateType.None)
|
||||
{
|
||||
float ratio = CalculateInterpolationValue(curKey, nextKey, time * 60);
|
||||
chara.transform.localPosition = Vector3.Lerp(curKey.Position, nextKey.Position, ratio);
|
||||
@@ -1561,6 +1591,209 @@ namespace Gallop.Live.Cutt
|
||||
}
|
||||
}
|
||||
|
||||
private void AlterUpdate_GlobalLight(LiveTimelineWorkSheet sheet, float currentFrame) {
|
||||
GlobalLightUpdateInfo updateInfo = default;
|
||||
int count = sheet.globalLightDataLists.Count;
|
||||
for(int i = 0; i < count; i++)
|
||||
{
|
||||
LiveTimelineKeyGlobalLightDataList keys = sheet.globalLightDataLists[i].keys;
|
||||
if (keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable) || !keys.EnablePlayModeTimeline(_playMode))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
else if (sheet.globalLightDataLists[i].name != "GlobalLight")
|
||||
{
|
||||
continue;
|
||||
}
|
||||
FindTimelineKey(out var curKey, out var nextKey, keys, currentFrame);
|
||||
if (curKey != null)
|
||||
{
|
||||
LiveTimelineKeyGlobalLightData lightData = curKey as LiveTimelineKeyGlobalLightData;
|
||||
LiveTimelineKeyGlobalLightData lightData2 = nextKey as LiveTimelineKeyGlobalLightData;
|
||||
Quaternion quaternion = Quaternion.identity;
|
||||
if (lightData.cameraFollow)
|
||||
{
|
||||
quaternion = GetCamera(sheet.targetCameraIndex).cacheTransform.rotation;
|
||||
}
|
||||
updateInfo.flags = lightData.flags;
|
||||
if (lightData2 != null && lightData2.interpolateType != 0)
|
||||
{
|
||||
float ratio = CalculateInterpolationValue(lightData, lightData2, currentFrame);
|
||||
Quaternion a = Quaternion.Euler(lightData.lightDir);
|
||||
Quaternion b = Quaternion.Euler(lightData2.lightDir);
|
||||
updateInfo.lightRotation = Quaternion.Lerp(a, b, ratio) * quaternion;
|
||||
updateInfo.globalRimShadowRate = LerpWithoutClamp(lightData.globalRimShadowRate, lightData2.globalRimShadowRate, ratio);
|
||||
updateInfo.rimColor = Color.Lerp(lightData.rimColor, lightData2.rimColor, ratio);
|
||||
updateInfo.rimStep = LerpWithoutClamp(lightData.rimStep, lightData2.rimStep, ratio);
|
||||
updateInfo.rimFeather = LerpWithoutClamp(lightData.rimFeather, lightData2.rimFeather, ratio);
|
||||
updateInfo.rimSpecRate = LerpWithoutClamp(lightData.rimSpecRate, lightData2.rimSpecRate, ratio);
|
||||
updateInfo.flags = lightData2.flags;
|
||||
updateInfo.RimHorizonOffset = LerpWithoutClamp(lightData.RimHorizonOffset, lightData2.RimHorizonOffset, ratio);
|
||||
updateInfo.RimVerticalOffset = LerpWithoutClamp(lightData.RimVerticalOffset, lightData2.RimVerticalOffset, ratio);
|
||||
updateInfo.RimHorizonOffset2 = LerpWithoutClamp(lightData.RimHorizonOffset2, lightData2.RimHorizonOffset2, ratio);
|
||||
updateInfo.RimVerticalOffset2 = LerpWithoutClamp(lightData.RimVerticalOffset2, lightData2.RimVerticalOffset2, ratio);
|
||||
updateInfo.rimColor2 = Color.Lerp(lightData.rimColor2, lightData2.rimColor2, ratio);
|
||||
updateInfo.rimStep2 = LerpWithoutClamp(lightData.rimStep2, lightData2.rimStep2, ratio);
|
||||
updateInfo.rimFeather2 = LerpWithoutClamp(lightData.rimFeather2, lightData2.rimFeather2, ratio);
|
||||
updateInfo.rimSpecRate2 = LerpWithoutClamp(lightData.rimSpecRate2, lightData2.rimSpecRate2, ratio);
|
||||
updateInfo.globalRimShadowRate2 = LerpWithoutClamp(lightData.globalRimShadowRate2, lightData2.globalRimShadowRate2, ratio);
|
||||
}
|
||||
else
|
||||
{
|
||||
updateInfo.lightRotation = Quaternion.Euler(lightData.lightDir) * quaternion;
|
||||
updateInfo.globalRimShadowRate = lightData.globalRimShadowRate;
|
||||
updateInfo.rimColor = lightData.rimColor;
|
||||
updateInfo.rimStep = lightData.rimStep;
|
||||
updateInfo.rimFeather = lightData.rimFeather;
|
||||
updateInfo.rimSpecRate = lightData.rimSpecRate;
|
||||
updateInfo.flags = lightData.flags;
|
||||
updateInfo.RimHorizonOffset = lightData.RimHorizonOffset;
|
||||
updateInfo.RimVerticalOffset = lightData.RimVerticalOffset;
|
||||
updateInfo.RimHorizonOffset2 = lightData.RimHorizonOffset2;
|
||||
updateInfo.RimVerticalOffset2 = lightData.RimVerticalOffset2;
|
||||
updateInfo.rimColor2 = lightData.rimColor2;
|
||||
updateInfo.rimStep2 = lightData.rimStep2;
|
||||
updateInfo.rimFeather2 = lightData.rimFeather2;
|
||||
updateInfo.rimSpecRate2 = lightData.rimSpecRate2;
|
||||
updateInfo.globalRimShadowRate2 = lightData.globalRimShadowRate2;
|
||||
}
|
||||
OnUpdateGlobalLight.Invoke(ref updateInfo);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private HashSet<string> validBgColorNames = new HashSet<string> { "CharaCenter", "CharaLeft", "CharaRight", "CharaColor" };
|
||||
|
||||
private void AlterUpdate_BgColor1(LiveTimelineWorkSheet sheet, float currentFrame) {
|
||||
int count = sheet.bgColor1List.Count;
|
||||
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
LiveTimelineKeyBgColor1DataList keys = sheet.bgColor1List[i].keys;
|
||||
if (keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable) || !keys.EnablePlayModeTimeline(_playMode))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
else if (!validBgColorNames.Contains(sheet.bgColor1List[i].name))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
FindTimelineKey(out var curKey, out var nextKey, keys, currentFrame);
|
||||
if (curKey == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
BgColor1UpdateInfo updateInfo = default;
|
||||
LiveTimelineKeyBgColor1Data bgColorData = curKey as LiveTimelineKeyBgColor1Data;
|
||||
LiveTimelineKeyBgColor1Data bgColorData2 = nextKey as LiveTimelineKeyBgColor1Data;
|
||||
if (bgColorData2 != null && bgColorData2.interpolateType != 0)
|
||||
{
|
||||
float t = CalculateInterpolationValue(bgColorData, bgColorData2, currentFrame);
|
||||
updateInfo.flags = bgColorData.flags;
|
||||
updateInfo.color = Color.Lerp(bgColorData.color, bgColorData2.color, t);
|
||||
updateInfo.toonDarkColor = Color.Lerp(bgColorData.toonDarkColor, bgColorData2.toonDarkColor, t);
|
||||
updateInfo.toonBrightColor = Color.Lerp(bgColorData.toonBrightColor, bgColorData2.toonBrightColor, t);
|
||||
updateInfo.outlineColor = Color.Lerp(bgColorData.outlineColor, bgColorData2.outlineColor, t);
|
||||
updateInfo.outlineColorBlend = bgColorData.outlineColorBlend;
|
||||
updateInfo.Saturation = LerpWithoutClamp(bgColorData.Saturation, bgColorData2.Saturation, t);
|
||||
}
|
||||
else
|
||||
{
|
||||
updateInfo.flags = bgColorData.flags;
|
||||
updateInfo.color = bgColorData.color;
|
||||
updateInfo.toonDarkColor = bgColorData.toonDarkColor;
|
||||
updateInfo.toonBrightColor = bgColorData.toonBrightColor;
|
||||
updateInfo.outlineColor = bgColorData.outlineColor;
|
||||
updateInfo.outlineColorBlend = bgColorData.outlineColorBlend;
|
||||
updateInfo.Saturation = bgColorData.Saturation;
|
||||
}
|
||||
OnUpdateBgColor1.Invoke(ref updateInfo);
|
||||
}
|
||||
}
|
||||
|
||||
private void AlterUpdate_TransformControl(LiveTimelineWorkSheet sheet, float currentFrame)
|
||||
{
|
||||
int count = sheet.transformList.Count;
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
var keys = sheet.transformList[i].keys;
|
||||
if (keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable) || !keys.EnablePlayModeTimeline(_playMode))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
FindTimelineKey(out var curKey, out var nextKey, keys, currentFrame);
|
||||
if (curKey == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
TransformUpdateInfo updateInfo = default;
|
||||
updateInfo.data = sheet.transformList[i];
|
||||
LiveTimelineKeyTransformData transformData = curKey as LiveTimelineKeyTransformData;
|
||||
LiveTimelineKeyTransformData transformData2 = nextKey as LiveTimelineKeyTransformData;
|
||||
if (transformData2 != null && transformData2.interpolateType != 0)
|
||||
{
|
||||
float t = CalculateInterpolationValue(transformData, transformData2, currentFrame);
|
||||
updateInfo.updateData.position = Vector3.Lerp(transformData.position, transformData2.position, t);
|
||||
updateInfo.updateData.rotation = Quaternion.Lerp(Quaternion.Euler(transformData.rotate), Quaternion.Euler(transformData2.rotate), t);
|
||||
updateInfo.updateData.scale = Vector3.Lerp(transformData.scale, transformData2.scale, t);
|
||||
}
|
||||
else
|
||||
{
|
||||
updateInfo.updateData.position = transformData.position;
|
||||
updateInfo.updateData.rotation = Quaternion.Euler(transformData.rotate);
|
||||
updateInfo.updateData.scale = transformData.scale;
|
||||
}
|
||||
OnUpdateTransform.Invoke(ref updateInfo);
|
||||
}
|
||||
}
|
||||
|
||||
private void AlterUpdate_ObjectControl(LiveTimelineWorkSheet sheet, float currentFrame)
|
||||
{
|
||||
int count = sheet.objectList.Count;
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
var keys = sheet.objectList[i].keys;
|
||||
if (keys.HasAttribute(LiveTimelineKeyDataListAttr.Disable) || !keys.EnablePlayModeTimeline(_playMode))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
else if (!StageObjectMap.ContainsKey(sheet.objectList[i].name))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
FindTimelineKey(out var curKey, out var nextKey, keys, currentFrame);
|
||||
if (curKey == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
ObjectUpdateInfo updateInfo = default;
|
||||
LiveTimelineKeyObjectData objectData = curKey as LiveTimelineKeyObjectData;
|
||||
LiveTimelineKeyObjectData objectData2 = nextKey as LiveTimelineKeyObjectData;
|
||||
if (objectData2 != null && objectData2.interpolateType != 0)
|
||||
{
|
||||
float t = CalculateInterpolationValue(objectData, objectData2, currentFrame);
|
||||
updateInfo.updateData.position = Vector3.Lerp(objectData.position, objectData2.position, t);
|
||||
updateInfo.updateData.rotation = Quaternion.Lerp(Quaternion.Euler(objectData.rotate), Quaternion.Euler(objectData2.rotate), t);
|
||||
updateInfo.updateData.scale = Vector3.Lerp(objectData.scale, objectData2.scale, t);
|
||||
}
|
||||
else
|
||||
{
|
||||
updateInfo.updateData.position = objectData.position;
|
||||
updateInfo.updateData.rotation = Quaternion.Euler(objectData.rotate);
|
||||
updateInfo.updateData.scale = objectData.scale;
|
||||
}
|
||||
updateInfo.data = sheet.objectList[i];
|
||||
updateInfo.renderEnable = objectData.renderEnable;
|
||||
updateInfo.AttachTarget = objectData.AttachTarget;
|
||||
updateInfo.CharacterPosition = objectData.CharacterPosition;
|
||||
updateInfo.MultiCameraIndex = objectData.MultiCameraIndex;
|
||||
updateInfo.OffsetType = objectData.OffsetValueType;
|
||||
updateInfo.LayerType = objectData.LayerTypeValue;
|
||||
updateInfo.IsLayerTypeRecursively = objectData.IsLayerTypeRecursively;
|
||||
OnUpdateObject.Invoke(ref updateInfo);
|
||||
}
|
||||
}
|
||||
|
||||
private static float LerpWithoutClamp(float a, float b, float t)
|
||||
{
|
||||
return a + (b - a) * t;
|
||||
|
||||
+67
-1
@@ -1,6 +1,8 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using static Gallop.Live.Cutt.LiveTimelineDefine;
|
||||
|
||||
namespace Gallop.Live.Cutt
|
||||
{
|
||||
@@ -13,7 +15,71 @@ namespace Gallop.Live.Cutt
|
||||
Max = 4
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
[Serializable]
|
||||
public class LiveTimelineKeyBgColor1Data : LiveTimelineKeyWithInterpolate
|
||||
{
|
||||
// Fields
|
||||
public Color color; // 0x2c
|
||||
public float power; // 0x3c
|
||||
public float scale; // 0x40
|
||||
public int flags; // 0x44
|
||||
public ColorType ColorType; // 0x48
|
||||
public float Saturation; // 0x4c
|
||||
public Color toonDarkColor; // 0x50
|
||||
public Color toonBrightColor; // 0x60
|
||||
public float vertexColorToonPower; // 0x70
|
||||
public float outlineWidthPower; // 0x74
|
||||
public Color outlineColor; // 0x78
|
||||
public OutlineColorBlend outlineColorBlend; // 0x88
|
||||
public LightBlendMode LightBlendMode; // 0x8c
|
||||
public bool IsProjector; // 0x90
|
||||
public string BlinkLightName; // 0x98
|
||||
public int BlinkLightNameHash; // 0xa0
|
||||
public int BlinkLightContainerIndex; // 0xa4
|
||||
public float BlinkLightBrightnessPower; // 0xa8
|
||||
public bool IsAdjustedBlinkLightColor; // 0xac
|
||||
public LiveTimelineKeyLoopType loopType; // 0xb0
|
||||
public int loopCount; // 0xb4
|
||||
public int loopExecutedCount; // 0xb8
|
||||
public int loopIntervalFrame; // 0xbc
|
||||
public bool isPasteLoopUnit; // 0xc0
|
||||
public bool isChangeLoopInterpolate; // 0xc1
|
||||
public float f32; // 0xc4
|
||||
public LiveTimelineKeyLoopType _loopType; // 0xc8
|
||||
public int _loopCount; // 0xcc
|
||||
public int _loopExecutedCount; // 0xd0
|
||||
public int _loopIntervalFrame; // 0xd4
|
||||
public bool _isChangeLoopInterpolate; // 0xd8
|
||||
//private const Int32 ATTR_SILHOUETTE; // 0x0
|
||||
//private const Int32 ATTR_SYNC_BLINKLIGHT; // 0x0
|
||||
|
||||
public bool IsSilhouette { get; set; }
|
||||
public bool IsSyncBlinkLight { get; set; }
|
||||
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineKeyBgColor1DataList : LiveTimelineKeyDataListTemplate<LiveTimelineKeyBgColor1Data>
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineBgColor1Data : ILiveTimelineGroupDataWithName
|
||||
{
|
||||
// Fields
|
||||
private const string DEFAULT_NAME = "BgColor1"; // 0x0
|
||||
public LiveTimelineKeyBgColor1DataList keys; // 0x28
|
||||
private int[] _targetCharaIdArray; // 0x30
|
||||
private int[] _targetDressIdArray; // 0x38
|
||||
|
||||
// Properties
|
||||
public int[] TargetCharaIdArray { get; }
|
||||
public int[] TargetDressIdArray { get; }
|
||||
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class ILiveTimelineGroupDataWithName : ILiveTimelineGroupData
|
||||
{
|
||||
public string name;
|
||||
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using static Gallop.Live.Cutt.LiveTimelineDefine;
|
||||
|
||||
namespace Gallop.Live.Cutt
|
||||
{
|
||||
[Serializable]
|
||||
public class LiveTimelineKeyBgColor2Data : LiveTimelineKeyWithInterpolate
|
||||
{
|
||||
// Fields
|
||||
public Color color1; // 0x2c
|
||||
public Color color2; // 0x3c
|
||||
public float power; // 0x4c
|
||||
public string BlinkLightName; // 0x50
|
||||
public int BlinkLightNameHash; // 0x58
|
||||
public int BlinkLightContainerIndex; // 0x5c
|
||||
public float BlinkLightBrightnessPower; // 0x60
|
||||
public bool IsSyncBlinkLightToColor1; // 0x64
|
||||
public bool IsSyncBlinkLightToColor2; // 0x65
|
||||
public bool IsAdjustedBlinkLightColor; // 0x66
|
||||
public LiveTimelineKeyLoopType loopType; // 0x68
|
||||
public int loopCount; // 0x6c
|
||||
public int loopExecutedCount; // 0x70
|
||||
public int loopIntervalFrame; // 0x74
|
||||
public bool isPasteLoopUnit; // 0x78
|
||||
public bool isChangeLoopInterpolate; // 0x79
|
||||
public float f32; // 0x7c
|
||||
public LiveTimelineKeyLoopType _loopType; // 0x80
|
||||
public int _loopCount; // 0x84
|
||||
public int _loopExecutedCount; // 0x88
|
||||
public int _loopIntervalFrame; // 0x8c
|
||||
public bool _isChangeLoopInterpolate; // 0x90
|
||||
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineKeyBgColor2DataList : LiveTimelineKeyDataListTemplate<LiveTimelineKeyBgColor2Data>
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineBgColor2Data : ILiveTimelineGroupDataWithName
|
||||
{
|
||||
// Fields
|
||||
private const string DEFAULT_NAME = "BgColor2"; // 0x0
|
||||
public LiveTimelineKeyBgColor1DataList keys; // 0x28
|
||||
}
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 642bf32136ecd1740bff1df8e635cc20
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
+18
@@ -1,6 +1,8 @@
|
||||
using Gallop.Live.Cutt;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Security.Cryptography;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Gallop.Live.Cutt
|
||||
@@ -100,6 +102,22 @@ namespace Gallop.Live.Cutt
|
||||
private bool _isUpdatedParentObject;
|
||||
private Transform _parentObjectTransform;
|
||||
private int _parentObjectTargetCount;
|
||||
|
||||
public Transform GetParentObjectTransform(LiveTimelineControl liveTimelineControl)
|
||||
{
|
||||
if (_parentObjectTransform != null)
|
||||
{
|
||||
return _parentObjectTransform;
|
||||
}
|
||||
|
||||
if (liveTimelineControl.StageObjectMap.TryGetValue(ParentObjectName, out GameObject gameObject))
|
||||
{
|
||||
_parentObjectTransform = gameObject.transform;
|
||||
return _parentObjectTransform;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using static Gallop.Live.Cutt.LiveTimelineDefine;
|
||||
|
||||
namespace Gallop.Live.Cutt
|
||||
{
|
||||
[Serializable]
|
||||
public class LiveTimelineKeyGlobalLightData : LiveTimelineKeyWithInterpolate
|
||||
{
|
||||
// Static field
|
||||
public static readonly Color DefaultRimColor;
|
||||
|
||||
// Public fields
|
||||
public Vector3 lightDir;
|
||||
public Color rimColor;
|
||||
public float rimStep;
|
||||
public float rimFeather;
|
||||
public float rimSpecRate;
|
||||
public float globalRimShadowRate;
|
||||
public bool cameraFollow;
|
||||
public float RimHorizonOffset;
|
||||
public float RimVerticalOffset;
|
||||
public float RimHorizonOffset2;
|
||||
public float RimVerticalOffset2;
|
||||
public Color rimColor2;
|
||||
public float rimStep2;
|
||||
public float rimFeather2;
|
||||
public float rimSpecRate2;
|
||||
public float globalRimShadowRate2;
|
||||
public LiveCharaPositionFlag flags;
|
||||
public string BlinkLightName;
|
||||
public int BlinkLightNameHash;
|
||||
public int BlinkLightContainerIndex;
|
||||
public LiveTimelineKeyLoopType loopType;
|
||||
public int loopCount;
|
||||
public int loopExecutedCount;
|
||||
public int loopIntervalFrame;
|
||||
public bool isPasteLoopUnit;
|
||||
public bool isChangeLoopInterpolate;
|
||||
|
||||
// Properties
|
||||
public bool IsSyncBlinkLightToRimColor { get; set; }
|
||||
public bool IsSyncBlinkLightToRimColor2 { get; set; }
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineKeyGlobalLightDataList : LiveTimelineKeyDataListTemplate<LiveTimelineKeyGlobalLightData>
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineGlobalLightData : ILiveTimelineGroupDataWithName
|
||||
{
|
||||
private const string default_name = "GlobalLight";
|
||||
public LiveTimelineKeyGlobalLightDataList keys;
|
||||
}
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dcf99bb4db6442b42ace13bc95add694
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
+57
@@ -1,3 +1,6 @@
|
||||
using System;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Gallop.Live.Cutt
|
||||
{
|
||||
public enum LiveCharaPosition
|
||||
@@ -28,4 +31,58 @@ namespace Gallop.Live.Cutt
|
||||
Right = 2,
|
||||
CharacterMax = 17
|
||||
}
|
||||
|
||||
public enum AttachType
|
||||
{
|
||||
None = 0,
|
||||
Camera = 1,
|
||||
Character = 2,
|
||||
}
|
||||
|
||||
public enum OffsetType
|
||||
{
|
||||
Direct = 0,
|
||||
Add = 1,
|
||||
}
|
||||
|
||||
|
||||
public enum LayerType
|
||||
{
|
||||
None = 0,
|
||||
Normal = 1,
|
||||
NotReflect = 2,
|
||||
Projector = 3,
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineKeyObjectDataList : LiveTimelineKeyDataListTemplate<LiveTimelineKeyObjectData>
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineKeyObjectData : LiveTimelineKeyWithInterpolate
|
||||
{
|
||||
public Vector3 position;
|
||||
public Vector3 rotate;
|
||||
public Vector3 scale;
|
||||
public bool renderEnable;
|
||||
public AttachType AttachTarget;
|
||||
public int CharacterPosition;
|
||||
public int MultiCameraIndex;
|
||||
public OffsetType OffsetValueType;
|
||||
public LayerType LayerTypeValue;
|
||||
public bool IsLayerTypeRecursively;
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineObjectData : ILiveTimelineGroupDataWithName
|
||||
{
|
||||
// Fields
|
||||
private const string default_name = "Object";
|
||||
public LiveTimelineKeyObjectDataList keys;
|
||||
public bool enablePosition;
|
||||
public bool enableRotate;
|
||||
public bool enableScale;
|
||||
}
|
||||
}
|
||||
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
using System;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Gallop.Live.Cutt
|
||||
{
|
||||
[Serializable]
|
||||
public class LiveTimelineKeyTransformDataList : LiveTimelineKeyDataListTemplate<LiveTimelineKeyTransformData>
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineKeyTransformData : LiveTimelineKeyWithInterpolate
|
||||
{
|
||||
public Vector3 position;
|
||||
public Vector3 rotate;
|
||||
public Vector3 scale;
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineTransformData : ILiveTimelineGroupDataWithName
|
||||
{
|
||||
private const string default_name = "Transform";
|
||||
public LiveTimelineKeyTransformDataList keys;
|
||||
public bool enablePosition;
|
||||
public bool enableRotate;
|
||||
public bool enableScale;
|
||||
}
|
||||
}
|
||||
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 802d655b98ea2e94ebf22b8c396babd1
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,14 +1,15 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Gallop.Live.Cutt
|
||||
{
|
||||
public class LiveTimelineDefine : MonoBehaviour
|
||||
{
|
||||
public enum FacialId
|
||||
{
|
||||
Base = 1001,
|
||||
public class LiveTimelineDefine : MonoBehaviour
|
||||
{
|
||||
public enum FacialId
|
||||
{
|
||||
Base = 1001,
|
||||
WinkR = 1002,
|
||||
WinkL = 1003,
|
||||
EyeHalfA = 1004,
|
||||
@@ -405,6 +406,150 @@ namespace Gallop.Live.Cutt
|
||||
Up = 1,
|
||||
Down = 2
|
||||
}
|
||||
}
|
||||
|
||||
public enum OutlineColorBlend
|
||||
{
|
||||
Blend = 0,
|
||||
Multiply = 1,
|
||||
Max = 2
|
||||
}
|
||||
|
||||
public enum LightBlendMode
|
||||
{
|
||||
Addition = 0,
|
||||
Multiply = 1,
|
||||
SoftAddition = 2,
|
||||
AlphaBlend = 3,
|
||||
Multiply0 = 4,
|
||||
Multiply2x = 5,
|
||||
}
|
||||
|
||||
public enum ColorType
|
||||
{
|
||||
Main = 0,
|
||||
Sub = 1,
|
||||
Training1 = 2,
|
||||
Training2 = 3,
|
||||
Border = 4,
|
||||
Num1 = 5,
|
||||
Num2 = 6,
|
||||
Turn = 7,
|
||||
Wipe1 = 8,
|
||||
Wipe2 = 9,
|
||||
Wipe3 = 10,
|
||||
Speech1 = 11,
|
||||
Nameplate1 = 12,
|
||||
Nameplate2 = 13,
|
||||
Speech2 = 14
|
||||
}
|
||||
|
||||
public enum LiveTimelineKeyDataType
|
||||
{
|
||||
Timescale = 0,
|
||||
CameraPos = 1,
|
||||
CameraLookAt = 2,
|
||||
CameraFov = 3,
|
||||
CameraRoll = 4,
|
||||
HandShakeCamera = 5,
|
||||
Event = 6,
|
||||
CharaMotionSequence = 7,
|
||||
BgColor1 = 8,
|
||||
BgColor2 = 9,
|
||||
MonitorControl = 10,
|
||||
CameraSwitcher = 11,
|
||||
LipSync = 12,
|
||||
PostEffectDOF = 13,
|
||||
PostEffectBloomDiffusion = 14,
|
||||
RadialBlur = 15,
|
||||
CameraLayer = 16,
|
||||
Projector = 17,
|
||||
FacialFace = 18,
|
||||
FacialMouth = 19,
|
||||
FacialCheek = 20,
|
||||
FacialEye = 21,
|
||||
FacialEyebrow = 22,
|
||||
FacialEyeTrack = 23,
|
||||
FacialEar = 24,
|
||||
FacialEffect = 25,
|
||||
FacialNoise = 26,
|
||||
CharaMotionNoise = 27,
|
||||
FormationOffset = 28,
|
||||
Animation = 29,
|
||||
TextureAnimation = 30,
|
||||
Transform = 31,
|
||||
Renderer = 32,
|
||||
Object = 33,
|
||||
Audience = 34,
|
||||
Props = 35,
|
||||
PropsAttach = 36,
|
||||
VolumeLight = 37,
|
||||
HdrBloom = 38,
|
||||
PostFilm = 39,
|
||||
Fade = 40,
|
||||
Particle = 41,
|
||||
ParticleGroup = 42,
|
||||
WashLight = 43,
|
||||
Laser = 44,
|
||||
BlinkLight = 45,
|
||||
UVScrollLight = 46,
|
||||
FacialToon = 47,
|
||||
GlobalLight = 48,
|
||||
GlobalFog = 49,
|
||||
LightShafts = 50,
|
||||
MonitorCameraPos = 51,
|
||||
MonitorCameraLookAt = 52,
|
||||
MultiCameraPos = 53,
|
||||
MultiCameraLookAt = 54,
|
||||
EyeCameraPos = 55,
|
||||
EyeCameraLookAt = 56,
|
||||
LensFlare = 57,
|
||||
Environment = 58,
|
||||
SweatLocator = 59,
|
||||
Effect = 60,
|
||||
ColorCorrection = 61,
|
||||
PreColorCorrection = 62,
|
||||
TiltShift = 63,
|
||||
A2U = 64,
|
||||
A2UConfig = 65,
|
||||
FlashPlayer = 66,
|
||||
Title = 67,
|
||||
Spotlight3d = 68,
|
||||
CharaNode = 69,
|
||||
NodeScale = 70,
|
||||
Fluctuation = 71,
|
||||
CharaFootLight = 72,
|
||||
ChromaticAberration = 73,
|
||||
LightProjection = 74,
|
||||
Billboard = 75,
|
||||
MultiCameraPostFilm = 76,
|
||||
MultiCameraPostEffectBloomDiffusion = 77,
|
||||
MultiCameraColorCorrection = 78,
|
||||
MultiCameraTiltShift = 79,
|
||||
MultiCameraRadialBlur = 80,
|
||||
MultiCameraPostEffectDOF = 81,
|
||||
AdditionalLight = 82,
|
||||
MultiLightShadow = 83,
|
||||
MobControl = 84,
|
||||
CyalumeControl = 85,
|
||||
CameraMotion = 86,
|
||||
WaveObject = 87,
|
||||
CharaWind = 88,
|
||||
CharaParts = 89,
|
||||
CameraCutNo = 90,
|
||||
ToneCurve = 91,
|
||||
Exposure = 92,
|
||||
Vortex = 93,
|
||||
CharaCollision = 94,
|
||||
TransmittedLight = 95,
|
||||
TransmittedLightMask = 96,
|
||||
Voice = 97,
|
||||
LipSyncPatternRange = 98,
|
||||
LipSyncPattern = 99,
|
||||
LensDistortion = 100,
|
||||
CharaNodeOffset = 101,
|
||||
TransparentCamera = 102,
|
||||
Max = 103
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
@@ -82,7 +83,7 @@ namespace Gallop.Live.Cutt
|
||||
_tempAnim.enabled = false;
|
||||
}
|
||||
|
||||
public void AlterUpdate(float currentTime)
|
||||
public void AlterUpdate(float currentTime, LiveTimelineKeyTimescaleDataList timescaleKeys)
|
||||
{
|
||||
var director = Director.instance;
|
||||
if (Director.instance.liveMode == 0)
|
||||
@@ -122,7 +123,34 @@ namespace Gallop.Live.Cutt
|
||||
{
|
||||
start = (double)arg.motionHeadFrameSeparetes[charaIndex] / 60;
|
||||
}
|
||||
double interval = (currentTime - arg.FrameSecond) * arg.playSpeed;
|
||||
|
||||
double interval = 0;
|
||||
double last_current_time = currentTime;
|
||||
if (timescaleKeys.thisList.Count > 0)
|
||||
{
|
||||
// apply timescale keys
|
||||
for (int i = timescaleKeys.thisList.Count - 1; i >= 0; i--)
|
||||
{
|
||||
var scaleKey = timescaleKeys.thisList[i];
|
||||
if (scaleKey.FrameSecond <= currentTime)
|
||||
{
|
||||
if (scaleKey.FrameSecond <= arg.FrameSecond)
|
||||
{
|
||||
interval += (last_current_time - arg.FrameSecond) * scaleKey.Timescale * arg.playSpeed;
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
interval += (last_current_time - scaleKey.FrameSecond) * scaleKey.Timescale * arg.playSpeed;
|
||||
last_current_time = scaleKey.FrameSecond;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
interval = (currentTime - arg.FrameSecond) * arg.playSpeed;
|
||||
}
|
||||
float currentAnimationTime = (float)(start + interval);
|
||||
|
||||
if (anim)
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using static Gallop.Live.Cutt.LiveTimelineDefine;
|
||||
|
||||
namespace Gallop.Live.Cutt
|
||||
{
|
||||
@@ -603,6 +604,8 @@ namespace Gallop.Live.Cutt
|
||||
public int frame;
|
||||
public LiveTimelineKeyAttribute attribute;
|
||||
|
||||
public LiveTimelineKeyDataType dataType;
|
||||
|
||||
private double _framesecond = -999;
|
||||
|
||||
public double FrameSecond {
|
||||
@@ -625,9 +628,14 @@ namespace Gallop.Live.Cutt
|
||||
public LiveTimelineEasing.Type easingType;
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineKeyTimescaleData : LiveTimelineKey
|
||||
{
|
||||
public float Timescale;
|
||||
}
|
||||
|
||||
//正在处理这里
|
||||
[System.Serializable]
|
||||
//ÕýÔÚ´¦ÀíÕâÀï
|
||||
[System.Serializable]
|
||||
public class LiveTimelineKeyCameraPositionData : LiveTimelineKeyWithInterpolate
|
||||
{
|
||||
public LiveCameraPositionType setType;
|
||||
@@ -874,6 +882,12 @@ namespace Gallop.Live.Cutt
|
||||
|
||||
public delegate void CameraPosUpdateInfoDelegate(ref CameraPosUpdateInfo updateInfo);
|
||||
|
||||
[Serializable]
|
||||
public class LiveTimelineKeyTimescaleDataList : LiveTimelineKeyDataListTemplate<LiveTimelineKeyTimescaleData>
|
||||
{
|
||||
public bool _isCheckSameFrame;
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
public class LiveTimelineKeyCameraPositionDataList : LiveTimelineKeyDataListTemplate<LiveTimelineKeyCameraPositionData>
|
||||
{
|
||||
@@ -896,6 +910,7 @@ namespace Gallop.Live.Cutt
|
||||
public float TotalTimeLength;
|
||||
public bool Lyrics;
|
||||
public LiveTimelineDefine.SheetIndex SheetType;
|
||||
[SerializeField] public LiveTimelineKeyTimescaleDataList timescaleKeys;
|
||||
[SerializeField] public LiveTimelineKeyCameraPositionDataList cameraPosKeys;
|
||||
[SerializeField] public List<LiveTimelineMultiCameraPositionData> multiCameraPosKeys;
|
||||
[SerializeField] public List<LiveTimelineMultiCameraLookAtData> multiCameraLookAtKeys;
|
||||
@@ -915,6 +930,13 @@ namespace Gallop.Live.Cutt
|
||||
[SerializeField] public LiveTimelineFacialData[] other4FacialArray;
|
||||
[SerializeField] public LiveTimelineFormationOffsetData formationOffsetSet;
|
||||
|
||||
[SerializeField] public List<LiveTimelineGlobalLightData> globalLightDataLists;
|
||||
[SerializeField] public List<LiveTimelineBgColor1Data> bgColor1List;
|
||||
[SerializeField] public List<LiveTimelineBgColor2Data> bgColor2List;
|
||||
|
||||
[SerializeField] public List<LiveTimelineTransformData> transformList;
|
||||
[SerializeField] public List<LiveTimelineObjectData> objectList;
|
||||
|
||||
/*
|
||||
//终于可以调用AB包了,虽然后面发现没什么用...说不定什么时候能用到
|
||||
private void Start()
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using static Gallop.Live.Cutt.LiveTimelineDefine;
|
||||
|
||||
namespace Gallop.Live.Cutt
|
||||
{
|
||||
public struct BgColor1UpdateInfo
|
||||
{
|
||||
// Fields
|
||||
public int TimelineNameHash; // 0x10
|
||||
public int[] TargetCharaIdArray; // 0x18
|
||||
public int[] TargetDressIdArray; // 0x20
|
||||
public Color color; // 0x28
|
||||
public float colorPower; // 0x38
|
||||
public float scale; // 0x3c
|
||||
public float Saturation; // 0x40
|
||||
public int flags; // 0x44
|
||||
public Color toonDarkColor; // 0x48
|
||||
public Color toonBrightColor; // 0x58
|
||||
public float vertexColorToonPower; // 0x68
|
||||
public float outlineWidthPower; // 0x6c
|
||||
public Color outlineColor; // 0x70
|
||||
public OutlineColorBlend outlineColorBlend; // 0x80
|
||||
public LightBlendMode LightBlendMode; // 0x84
|
||||
public bool IsSilhouette; // 0x88
|
||||
public bool IsProjector; // 0x89
|
||||
public ColorType CurrentColorType; // 0x8c
|
||||
public Color CurrentColor; // 0x90
|
||||
public int CurrentFlags; // 0xa0
|
||||
public ColorType NextColorType; // 0xa4
|
||||
public Color NextColor; // 0xa8
|
||||
public int NextFlags; // 0xb8
|
||||
public float InterpolateRatio; // 0xbc
|
||||
public bool IsSyncBlinkLight; // 0xc0
|
||||
public bool IsSyncBlinkLightNext; // 0xc1
|
||||
public bool IsAdjustedBlinkLightColor; // 0xc2
|
||||
public int BlinkLightNameHash; // 0xc4
|
||||
public int BlinkLightContainerIndex; // 0xc8
|
||||
public float BlinkLightBrightnessPower; // 0xcc
|
||||
}
|
||||
|
||||
public delegate void BgColor1UpdateInfoDelegate(ref BgColor1UpdateInfo updateInfo);
|
||||
|
||||
public struct BgColor2UpdateInfo
|
||||
{
|
||||
// Fields
|
||||
public int TimelineNameHash; // 0x10
|
||||
public Color color1; // 0x14
|
||||
public Color color2; // 0x24
|
||||
public float value; // 0x34
|
||||
public int rndValueIdx; // 0x38
|
||||
}
|
||||
|
||||
public delegate void BgColor2UpdateInfoDelegate(ref BgColor2UpdateInfo updateInfo);
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2fd7f5ece3508c74eb2a0f0c003367ab
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d23729e48867d7143b85da3439885191
|
||||
guid: 4cc8fc1d38ab89c46973d235c8a6e42c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
@@ -0,0 +1,30 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Gallop.Live.Cutt
|
||||
{
|
||||
public struct GlobalLightUpdateInfo
|
||||
{
|
||||
// Fields
|
||||
public Quaternion lightRotation; // 0x10
|
||||
public float globalRimShadowRate; // 0x20
|
||||
public Color rimColor; // 0x24
|
||||
public float rimStep; // 0x34
|
||||
public float rimFeather; // 0x38
|
||||
public float rimSpecRate; // 0x3c
|
||||
public LiveCharaPositionFlag flags; // 0x40
|
||||
public float RimHorizonOffset; // 0x44
|
||||
public float RimVerticalOffset; // 0x48
|
||||
public float RimHorizonOffset2; // 0x4c
|
||||
public float RimVerticalOffset2; // 0x50
|
||||
public Color rimColor2; // 0x54
|
||||
public float rimStep2; // 0x64
|
||||
public float rimFeather2; // 0x68
|
||||
public float rimSpecRate2; // 0x6c
|
||||
public float globalRimShadowRate2; // 0x70
|
||||
}
|
||||
|
||||
public delegate void GlobalLightUpdateInfoDelegate(ref GlobalLightUpdateInfo updateInfo);
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a7b4156d6854f014dacbd5accca6ca40
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,30 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using static Gallop.Live.Cutt.LiveTimelineDefine;
|
||||
|
||||
namespace Gallop.Live.Cutt
|
||||
{
|
||||
public struct TransformBaseData
|
||||
{
|
||||
public Vector3 position;
|
||||
public Quaternion rotation;
|
||||
public Vector3 scale;
|
||||
}
|
||||
|
||||
public struct ObjectUpdateInfo
|
||||
{
|
||||
public LiveTimelineObjectData data;
|
||||
public TransformBaseData updateData;
|
||||
public bool renderEnable;
|
||||
public AttachType AttachTarget;
|
||||
public int CharacterPosition;
|
||||
public int MultiCameraIndex;
|
||||
public OffsetType OffsetType;
|
||||
public LayerType LayerType;
|
||||
public bool IsLayerTypeRecursively;
|
||||
}
|
||||
|
||||
public delegate void ObjectUpdateInfoDelegate(ref ObjectUpdateInfo updateInfo);
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 236ab682e89d7904ea32d67bdac14a31
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,16 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using static Gallop.Live.Cutt.LiveTimelineDefine;
|
||||
|
||||
namespace Gallop.Live.Cutt
|
||||
{
|
||||
public struct TransformUpdateInfo
|
||||
{
|
||||
public LiveTimelineTransformData data;
|
||||
public TransformBaseData updateData;
|
||||
}
|
||||
|
||||
public delegate void TransformUpdateInfoDelegate(ref TransformUpdateInfo updateInfo);
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b66324f884c18d1488c452817ef4ed06
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -104,6 +104,7 @@ namespace Gallop.Live
|
||||
{
|
||||
Debug.Log(live.BackGroundId);
|
||||
Builder.LoadAssetPath(string.Format(STAGE_PATH, live.BackGroundId), transform);
|
||||
_liveTimelineControl.StageObjectMap = _stageController.StageObjectMap;
|
||||
}
|
||||
|
||||
//Make CharacterObject
|
||||
@@ -187,6 +188,7 @@ namespace Gallop.Live
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
_liveTimelineControl.OnUpdateFacial += delegate (FacialDataUpdateInfo updateInfo_, float liveTime_, int position)
|
||||
{
|
||||
if (position < charaObjs.Count)
|
||||
@@ -195,6 +197,71 @@ namespace Gallop.Live
|
||||
container.FaceDrivenKeyTarget.AlterUpdateFacialNew(ref updateInfo_, liveTime_);
|
||||
}
|
||||
};
|
||||
|
||||
_liveTimelineControl.OnUpdateGlobalLight += delegate (ref GlobalLightUpdateInfo updateInfo)
|
||||
{
|
||||
var tmpPos = -(updateInfo.lightRotation * Vector3.forward).normalized;
|
||||
foreach (var locator in _liveTimelineControl.liveCharactorLocators)
|
||||
{
|
||||
if (locator != null && updateInfo.flags.hasFlag(locator.liveCharaStandingPosition) && locator is LiveTimelineCharaLocator charaLocator)
|
||||
{
|
||||
var container = charaLocator.UmaContainer;
|
||||
if (container)
|
||||
{
|
||||
MaterialPropertyBlock propertyBlock = new MaterialPropertyBlock();
|
||||
propertyBlock.SetFloat("_RimShadowRate", updateInfo.globalRimShadowRate);
|
||||
propertyBlock.SetColor("_RimColor", updateInfo.rimColor);
|
||||
propertyBlock.SetFloat("_RimStep", updateInfo.rimStep);
|
||||
propertyBlock.SetFloat("_RimFeather", updateInfo.rimFeather);
|
||||
propertyBlock.SetFloat("_RimSpecRate", updateInfo.rimSpecRate);
|
||||
propertyBlock.SetFloat("_RimHorizonOffset", updateInfo.RimHorizonOffset);
|
||||
propertyBlock.SetFloat("_RimVerticalOffset", updateInfo.RimVerticalOffset);
|
||||
propertyBlock.SetFloat("_RimHorizonOffset2", updateInfo.RimHorizonOffset2);
|
||||
propertyBlock.SetFloat("_RimVerticalOffset2", updateInfo.RimVerticalOffset2);
|
||||
propertyBlock.SetColor("_RimColor2", updateInfo.rimColor2);
|
||||
propertyBlock.SetFloat("_RimStep2", updateInfo.rimStep2);
|
||||
propertyBlock.SetFloat("_RimFeather2", updateInfo.rimFeather2);
|
||||
propertyBlock.SetFloat("_RimSpecRate2", updateInfo.rimSpecRate2);
|
||||
propertyBlock.SetFloat("_RimShadowRate2", updateInfo.globalRimShadowRate2);
|
||||
foreach (var renderer in container.Renderers)
|
||||
{
|
||||
renderer.SetPropertyBlock(propertyBlock);
|
||||
foreach(var mat in renderer.materials)
|
||||
{
|
||||
mat.SetFloat("_UseOriginalDirectionalLight", 1);
|
||||
mat.SetVector("_OriginalDirectionalLightDir", tmpPos);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
_liveTimelineControl.OnUpdateBgColor1 += delegate (ref BgColor1UpdateInfo updateInfo)
|
||||
{
|
||||
foreach (var locator in _liveTimelineControl.liveCharactorLocators)
|
||||
{
|
||||
var EFlags = (LiveCharaPositionFlag)updateInfo.flags;
|
||||
if (locator != null && (updateInfo.flags == 0 || EFlags.hasFlag(locator.liveCharaStandingPosition)) && locator is LiveTimelineCharaLocator charaLocator)
|
||||
{
|
||||
var container = charaLocator.UmaContainer;
|
||||
if (container)
|
||||
{
|
||||
MaterialPropertyBlock propertyBlock = new MaterialPropertyBlock();
|
||||
propertyBlock.SetColor("_CharaColor", updateInfo.color);
|
||||
propertyBlock.SetColor("_ToonDarkColor", updateInfo.toonDarkColor);
|
||||
propertyBlock.SetColor("_ToonBrightColor", updateInfo.toonBrightColor);
|
||||
propertyBlock.SetColor("_OutlineColor", updateInfo.outlineColor);
|
||||
propertyBlock.SetFloat("_Saturation", updateInfo.Saturation);
|
||||
foreach (var renderer in container.Renderers)
|
||||
{
|
||||
renderer.SetPropertyBlock(propertyBlock);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
SetupCharacterLocator();
|
||||
InitializeCamera();
|
||||
UpdateMainCamera();
|
||||
@@ -284,6 +351,7 @@ namespace Gallop.Live
|
||||
{
|
||||
var container = CharaContainerScript[i];
|
||||
container.LiveLocator = new LiveTimelineCharaLocator(container);
|
||||
container.LiveLocator.liveCharaStandingPosition = (LiveCharaPosition)i;
|
||||
_liveTimelineControl.liveCharactorLocators[i] = container.LiveLocator;
|
||||
container.LiveLocator.liveCharaInitialPosition = container.transform.position;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using Gallop.Live.Cutt;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
@@ -5,9 +6,21 @@ using UnityEngine;
|
||||
|
||||
namespace Gallop.Live
|
||||
{
|
||||
[Serializable]
|
||||
public class StageObjectUnit
|
||||
{
|
||||
public string UnitName;
|
||||
public GameObject[] ChildObjects;
|
||||
public string[] _childObjectNames;
|
||||
}
|
||||
|
||||
public class StageController : MonoBehaviour
|
||||
{
|
||||
public List<GameObject> _stageObjects;
|
||||
public StageObjectUnit[] _stageObjectUnits;
|
||||
public Dictionary<string, StageObjectUnit> StageObjectUnitMap = new Dictionary<string, StageObjectUnit>();
|
||||
public Dictionary<string, GameObject> StageObjectMap = new Dictionary<string, GameObject>();
|
||||
public Dictionary<string, Transform> StageParentMap = new Dictionary<string, Transform>();
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
@@ -15,6 +28,17 @@ namespace Gallop.Live
|
||||
if (Director.instance)
|
||||
{
|
||||
Director.instance._stageController = this;
|
||||
Director.instance._liveTimelineControl.OnUpdateTransform += UpdateTransform;
|
||||
Director.instance._liveTimelineControl.OnUpdateObject += UpdateObject;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
if (Director.instance)
|
||||
{
|
||||
Director.instance._liveTimelineControl.OnUpdateTransform -= UpdateTransform;
|
||||
Director.instance._liveTimelineControl.OnUpdateObject -= UpdateObject;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,7 +46,112 @@ namespace Gallop.Live
|
||||
{
|
||||
foreach (GameObject stage_part in _stageObjects)
|
||||
{
|
||||
Instantiate(stage_part, transform);
|
||||
var instance = Instantiate(stage_part, transform);
|
||||
foreach (var child in instance.GetComponentsInChildren<Transform>(true))
|
||||
{
|
||||
if (!StageObjectMap.ContainsKey(child.name))
|
||||
{
|
||||
if (child.name.Contains("light"))
|
||||
{
|
||||
// Since the parsing of light material keyframes has been implemented
|
||||
// Directly displaying the light will block the view
|
||||
// Therefore, the light's GameObject is hidden here first
|
||||
// TODO: Remove this after implementing light parsing
|
||||
child.gameObject.SetActive(false);
|
||||
continue;
|
||||
}
|
||||
var tmp_name = child.name.Replace("(Clone)", "");
|
||||
StageObjectMap.Add(tmp_name, child.gameObject);
|
||||
StageParentMap.TryAdd(tmp_name, child.gameObject.transform.parent);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var unit in _stageObjectUnits)
|
||||
{
|
||||
if (!StageObjectUnitMap.ContainsKey(unit.UnitName))
|
||||
{
|
||||
StageObjectUnitMap.Add(unit.UnitName, unit);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void UpdateObject(ref ObjectUpdateInfo updateInfo) {
|
||||
|
||||
if (updateInfo.data == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (StageObjectMap.TryGetValue(updateInfo.data.name, out GameObject gameObject))
|
||||
{
|
||||
gameObject.SetActive(updateInfo.renderEnable);
|
||||
|
||||
Transform attach_transform = null;
|
||||
switch (updateInfo.AttachTarget)
|
||||
{
|
||||
case AttachType.None:
|
||||
if(StageParentMap.TryGetValue(updateInfo.data.name, out Transform parentTransform))
|
||||
{
|
||||
attach_transform = parentTransform;
|
||||
}
|
||||
break;
|
||||
case AttachType.Character:
|
||||
var chara = Director.instance.CharaContainerScript[updateInfo.CharacterPosition];
|
||||
if (chara)
|
||||
{
|
||||
attach_transform = chara.transform;
|
||||
}
|
||||
break;
|
||||
case AttachType.Camera:
|
||||
attach_transform = Director.instance.MainCameraTransform;
|
||||
break;
|
||||
}
|
||||
if (gameObject.transform.parent != attach_transform)
|
||||
{
|
||||
gameObject.transform.SetParent(attach_transform);
|
||||
}
|
||||
|
||||
if (updateInfo.data.enablePosition)
|
||||
{
|
||||
gameObject.transform.localPosition = updateInfo.updateData.position;
|
||||
}
|
||||
if (updateInfo.data.enableRotate)
|
||||
{
|
||||
gameObject.transform.localRotation = updateInfo.updateData.rotation;
|
||||
}
|
||||
if (updateInfo.data.enableScale)
|
||||
{
|
||||
gameObject.transform.localScale = updateInfo.updateData.scale;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void UpdateTransform(ref TransformUpdateInfo updateInfo)
|
||||
{
|
||||
if (updateInfo.data == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (StageObjectUnitMap.TryGetValue(updateInfo.data.name, out StageObjectUnit objectUnit))
|
||||
{
|
||||
foreach(var child in objectUnit.ChildObjects)
|
||||
{
|
||||
if (StageObjectMap.TryGetValue(child.name, out GameObject gameObject))
|
||||
{
|
||||
if (updateInfo.data.enablePosition)
|
||||
{
|
||||
gameObject.transform.localPosition = updateInfo.updateData.position;
|
||||
}
|
||||
if (updateInfo.data.enableRotate)
|
||||
{
|
||||
gameObject.transform.localRotation = updateInfo.updateData.rotation;
|
||||
}
|
||||
if (updateInfo.data.enableScale)
|
||||
{
|
||||
gameObject.transform.localScale = updateInfo.updateData.scale;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2f07b01a4a8f75c49af0f7340468ed3b
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,14 @@
|
||||
namespace Gallop.RenderPipeline
|
||||
{
|
||||
public enum CutoffType
|
||||
{
|
||||
Invalid = -1,
|
||||
UnSupport = 0,
|
||||
UnSupportButDraw = 1,
|
||||
DiscardSrcTexA = 2,
|
||||
DiscardSrcTexB = 3,
|
||||
AlphaBlend = 4,
|
||||
AlphaBlendSrcTexR = 5,
|
||||
Max = 6,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2c87c0f004ed3834f87c5527519f1111
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -158,7 +158,6 @@ PlayerSettings:
|
||||
m_ColorGamuts: 00000000
|
||||
targetPixelDensity: 395
|
||||
resolutionScalingMode: 1
|
||||
resetResolutionOnWindowResize: 0
|
||||
androidSupportedAspectRatio: 1
|
||||
androidMaxAspectRatio: 2.1
|
||||
applicationIdentifier:
|
||||
@@ -625,11 +624,8 @@ PlayerSettings:
|
||||
switchNetworkInterfaceManagerInitializeEnabled: 1
|
||||
switchDisableHTCSPlayerConnection: 0
|
||||
switchUseNewStyleFilepaths: 0
|
||||
switchUseLegacyFmodPriorities: 1
|
||||
switchUseMicroSleepForYield: 1
|
||||
switchEnableRamDiskSupport: 0
|
||||
switchMicroSleepForYieldTime: 25
|
||||
switchRamDiskSpaceSize: 12
|
||||
ps4NPAgeRating: 12
|
||||
ps4NPTitleSecret:
|
||||
ps4NPTrophyPackPath:
|
||||
@@ -822,7 +818,6 @@ PlayerSettings:
|
||||
metroFTAName:
|
||||
metroFTAFileTypes: []
|
||||
metroProtocolName:
|
||||
vcxProjDefaultLanguage:
|
||||
XboxOneProductId:
|
||||
XboxOneUpdateKey:
|
||||
XboxOneSandboxId:
|
||||
@@ -871,7 +866,6 @@ PlayerSettings:
|
||||
hmiCpuConfiguration:
|
||||
apiCompatibilityLevel: 6
|
||||
activeInputHandler: 0
|
||||
windowsGamepadBackendHint: 0
|
||||
cloudProjectId:
|
||||
framebufferDepthMemorylessMode: 0
|
||||
qualitySettingsNames: []
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user