Commit 113a16f4 authored by SherryChaos's avatar SherryChaos

new alt characters

parent 055851a6
fileFormatVersion: 2
guid: 5bbfe301136cbc44c9ad3448ed6ff82b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: cdb3f36db85106b4baf6e608cbdb8d97
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ecb5960cf6184ea4caed5378fdf61fd7
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 88b22bd0d0f39394481fa938a3ae1f59
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -67,6 +67,7 @@ SpriteAtlas:
- 9b1905e02c2dbe642a9aaae465254894: 21300000
- 053e5de00dcdfdd44ac335092f4608a4: 21300000
- e55da8f083f0d9e48b65356a0408cb4c: 21300000
- 5bbfe301136cbc44c9ad3448ed6ff82b: 21300000
- 9cb31c217fa4ebd4a8b5e65d1574e0b4: 21300000
- 50800c31d0d915c44807df117d5e06d9: 21300000
- ee78ea512dfaef64d8031bbe52174f1d: 21300000
......@@ -241,6 +242,7 @@ SpriteAtlas:
- 350b7d1d598dd424496b00909a13805a: 21300000
- e6e1403d9587303409a4d5b6f0dc16b7: 21300000
- f3af564d014179e468137ff676f1c60e: 21300000
- cdb3f36db85106b4baf6e608cbdb8d97: 21300000
- 4e76a37dd0ad3a84187d22d0080c013d: 21300000
- decb45ad6098a5e45948d27e3a14324a: 21300000
- 831823ed3747888418a12e4b452e1d27: 21300000
......@@ -294,6 +296,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: 9b1905e02c2dbe642a9aaae465254894, type: 3}
- {fileID: 21300000, guid: 053e5de00dcdfdd44ac335092f4608a4, type: 3}
- {fileID: 21300000, guid: e55da8f083f0d9e48b65356a0408cb4c, type: 3}
- {fileID: 21300000, guid: 5bbfe301136cbc44c9ad3448ed6ff82b, type: 3}
- {fileID: 21300000, guid: 9cb31c217fa4ebd4a8b5e65d1574e0b4, type: 3}
- {fileID: 21300000, guid: 50800c31d0d915c44807df117d5e06d9, type: 3}
- {fileID: 21300000, guid: ee78ea512dfaef64d8031bbe52174f1d, type: 3}
......@@ -468,6 +471,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: 350b7d1d598dd424496b00909a13805a, type: 3}
- {fileID: 21300000, guid: e6e1403d9587303409a4d5b6f0dc16b7, type: 3}
- {fileID: 21300000, guid: f3af564d014179e468137ff676f1c60e, type: 3}
- {fileID: 21300000, guid: cdb3f36db85106b4baf6e608cbdb8d97, type: 3}
- {fileID: 21300000, guid: 4e76a37dd0ad3a84187d22d0080c013d, type: 3}
- {fileID: 21300000, guid: decb45ad6098a5e45948d27e3a14324a, type: 3}
- {fileID: 21300000, guid: 831823ed3747888418a12e4b452e1d27, type: 3}
......@@ -520,6 +524,7 @@ SpriteAtlas:
- sn0433
- sn0240
- sn0703
- sn0041
- sn0506
- sn0333
- sn0808
......@@ -694,6 +699,7 @@ SpriteAtlas:
- sn0819
- sn0419
- sn0605
- sn0042
- sn9005
- sn0608
- sn0603
......
......@@ -2,9 +2,10 @@
MDPro3 v1.3.7更新:
1.卡组编辑界面的[测试]按钮恢复功能,并以第一位WindBot为对手,不洗牌进行决斗;
2.减少开机加载时间。
3.[观看动画]中,玩家投稿的Cutin动画将用灰色字体显示;
4.修复外观设置中,壁纸的[无设置]与[随机]不生效的错误;
5.修复 召唤兽 梅尔卡巴[75286622] 在非Windows端的Spine动画资源丢失的错误。
3.增加语音功能中决斗链接的异画角色:暗游戏[0041]、海马濑人[0042];
4.[观看动画]中,玩家投稿的Cutin动画将用灰色字体显示;
5.修复外观设置中,壁纸的[无设置]与[随机]不生效的错误;
6.修复 召唤兽 梅尔卡巴[75286622] 在非Windows端的Spine动画资源丢失的错误。
MDPro3 v1.3.6更新:
1.新卡片特效:小丑与锁鸟[94145021];
......
......@@ -46,12 +46,14 @@ namespace MDPro3.Duel
if (language != loadedLanguage || heroString != chara)
{
var originalChara = CharacterSelector.characters.GetCharacterOriginalId(chara);
heroString = chara;
var dataPath = jsonPath + Utility.Language.Japanese + "/voice/V" + heroString + ".json";
var dataPath = jsonPath + Utility.Language.Japanese + "/voice/V" + originalChara + ".json";
var txt = File.ReadAllText(dataPath);
heroVoices = JsonConvert.DeserializeObject<VoicesData>(txt);
dataPath = jsonPath + language + "/voice/SN" + heroString + ".json";
dataPath = jsonPath + language + "/voice/SN" + originalChara + ".json";
txt = File.ReadAllText(dataPath);
heroLines = JsonConvert.DeserializeObject<LinesData>(txt);
}
......@@ -59,12 +61,14 @@ namespace MDPro3.Duel
chara = Config.Get(condition + "Character1", defaultCharacter);
if (language != loadedLanguage || rivalString != chara)
{
var originalChara = CharacterSelector.characters.GetCharacterOriginalId(chara);
rivalString = chara;
var dataPath = jsonPath + Utility.Language.Japanese + "/voice/V" + rivalString + ".json";
var dataPath = jsonPath + Utility.Language.Japanese + "/voice/V" + originalChara + ".json";
var txt = File.ReadAllText(dataPath);
rivalVoices = JsonConvert.DeserializeObject<VoicesData>(txt);
dataPath = jsonPath + language + "/voice/SN" + rivalString + ".json";
dataPath = jsonPath + language + "/voice/SN" + originalChara + ".json";
txt = File.ReadAllText(dataPath);
rivalLines = JsonConvert.DeserializeObject<LinesData>(txt);
}
......
......@@ -13,7 +13,13 @@ namespace MDPro3
public struct SeriesCharacter
{
public string id;
public string originalId;
public bool notReady;
public readonly string GetOriginalId()
{
return string.IsNullOrEmpty(originalId) ? id : originalId;
}
}
public List<SeriesCharacter> dm;
......@@ -31,7 +37,7 @@ namespace MDPro3
NPC_Profiles profiles;
public string language = "zh-CN";
static Characters instance;
private static Characters instance;
public string GetCharacterSeries(string charaID)
{
......@@ -70,31 +76,55 @@ namespace MDPro3
public List<SeriesCharacter> GetSeriesCharacters(string serial)
{
switch (serial)
{
case "00":
return dm;
case "01":
return gx;
case "02":
return _5ds;
case "03":
return dsod;
case "04":
return zexal;
case "05":
return arcv;
case "06":
return vrains;
case "07":
return sevens;
case "08":
return npc;
case "09":
return gorush;
default:
return dm;
return serial switch
{
"00" => dm,
"01" => gx,
"02" => _5ds,
"03" => dsod,
"04" => zexal,
"05" => arcv,
"06" => vrains,
"07" => sevens,
"08" => npc,
"09" => gorush,
_ => dm,
};
}
public string GetCharacterOriginalId(string charaID)
{
foreach (var c in dm)
if (c.id == charaID)
return c.GetOriginalId();
foreach (var c in gx)
if (c.id == charaID)
return c.GetOriginalId();
foreach (var c in _5ds)
if (c.id == charaID)
return c.GetOriginalId();
foreach (var c in dsod)
if (c.id == charaID)
return c.GetOriginalId();
foreach (var c in zexal)
if (c.id == charaID)
return c.GetOriginalId();
foreach (var c in arcv)
if (c.id == charaID)
return c.GetOriginalId();
foreach (var c in vrains)
if (c.id == charaID)
return c.GetOriginalId();
foreach (var c in sevens)
if (c.id == charaID)
return c.GetOriginalId();
foreach (var c in npc)
if (c.id == charaID)
return c.GetOriginalId();
foreach (var c in gorush)
if (c.id == charaID)
return c.GetOriginalId();
return charaID;
}
static bool initialized = false;
......
......@@ -53,6 +53,9 @@ namespace MDPro3.UI
base.CallToggleOnEvent();
CallHoverOnEvent();
Program.instance.character.GetUI<CharacterSelectorUI>().TextDetailName.text = charaName;
#if UNITY_EDITOR
Program.instance.character.GetUI<CharacterSelectorUI>().TextDetailName.text += $" ({characterID})";
#endif
Program.instance.character.GetUI<CharacterSelectorUI>().TextDetailDescription.text = charaProfile;
Config.Set(CharacterSelector.condition + "Character" + CharacterSelectorUI.player, characterID);
Program.instance.ocgcore.CheckCharaFace();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment