Skip to content

M
MDPro3
Commit a86eb9b3 authored by SherryChaos's avatar SherryChaos
Browse files
Options

new wallpaper

parent 8f2dd20f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 42185 additions and 127 deletions
.gitignore
View file @ a86eb9b3
......@@ -59,3 +59,4 @@ Data/ur.ydk
/Assets/Spine/
/Assets/SpineWallpaper/
/Assets/StreamingAssets/
/Assets/Wallpaper/
\ No newline at end of file
Assets/Addressables/AddressableAssetsData/AssetGroups/Wallpaper.asset
View file @ a86eb9b3
......@@ -197,6 +197,10 @@ MonoBehaviour:
m_Address: 1130036
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 65ccd104f6d26a84faa4c0bf44da4796
m_Address: 1135005
m_ReadOnly: 0
m_SerializedLabels: []
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: e38330e9272b0a94a916f68bd5115c96, type: 2}
m_SchemaSet:
......
Assets/Addressables/Text/UpdateContent.txt
View file @ a86eb9b3
......@@ -3,18 +3,20 @@ MDPro3 v1.1.0更新：
1.添加决斗日志功能。
2.添加背景切换功能。
3.添加决斗中的特效绿幕功能，按下G键开启和关闭；开启时，数字键更改绿幕颜色，0-9：黑红橙黄绿青蓝紫灰白。
4.现在非闪卡卡面也有圆角了、更加还原的镜碎特效。
4.现在非闪卡卡面也有圆角了。
5.现在能查看未知卡片了。
6.现在选择卡片框也支持鼠标滚轮翻页了。
7.现在能修改本地人机时的端口了。
8.现在能开关右上角的弹窗消息了。
9.新投稿动画：元素英雄 水手侠、元素英雄 永生侠、命运英雄 恐惧人。
10.连接箭头默认不再显示在立绘之上。
11.修复开启立绘后，对方的连接怪兽连接箭头方向与预期相反的错误。
12.修复选择表示形式时，里侧守备表示的选项为纯白的错误。
13.修复英语、西班牙语、繁体中文下，灵摆卡片描述文字没有被正确分割的错误。
14.修复融合素材多次移动时（如珠泪），部分情况下融合特效卡图为未知卡图的错误。
15.修复使用Esc键取消发动效果时，游戏报错、不能继续决斗的错误。
10.新壁纸：黑魔术少女（Rush Duel）。
11.连接箭头默认不再显示在立绘之上。
12.修复镜碎特效某些时候特效缺失的错误。
13.修复开启立绘后，对方连接怪兽的连接箭头方向与预期相反的错误。
14.修复选择表示形式时，里侧守备表示的选项为纯白的错误。
15.修复英语、西班牙语、繁体中文下，灵摆卡片描述文字没有被正确分割的错误。
16.修复融合素材多次移动时（如珠泪），部分情况下融合特效卡图为未知卡图的错误。
17.修复使用Esc键取消发动效果时，游戏报错、不能继续决斗的错误。
MDPro3 v1.0.9更新：
1.设置中新增了超先行卡的一键下载功能。
......
Assets/Texture/Texture_Other/AppIcon.jpg.meta → Assets/Addressables/Texture/Wallpaper/WallPaperIcon1135005.png.meta
View file @ a86eb9b3
fileFormatVersion: 2
guid: ed39a2f11c4808147b175ad329506671
guid: 65ccd104f6d26a84faa4c0bf44da4796
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
......@@ -61,15 +61,15 @@ TextureImporter:
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 1
cookieLightType: 2
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
......@@ -81,7 +81,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
......@@ -89,11 +89,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
......@@ -101,11 +101,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
......
Assets/Fonts/SourceHanSansSC-Medium SDF.asset
View file @ a86eb9b3
This diff is collapsed.
Assets/Main.unity
View file @ a86eb9b3
......@@ -59347,7 +59347,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0.000030517578}
m_SizeDelta: {x: 0, y: 300}
m_Pivot: {x: 0.5, y: 1}
--- !u!1 &1117266860
Assets/ScriptableObjects/Items.asset
View file @ a86eb9b3
......@@ -328,6 +328,13 @@ MonoBehaviour:
functional: 0
secondFace: 0
diy: 1
- id: 1135005
m_name: "\u9ED1\u9B54\u672F\u5C11\u5973 RD"
m_description: "\u4F60MDPro3\u4E5F\u662F\u4E8C\u6E38\u3002"
path: Wallpaper/front5005
functional: 0
secondFace: 0
diy: 0
faces:
- id: 1010001
m_name:
......
Assets/ScriptableObjects/Items.cs
View file @ a86eb9b3
......@@ -17,12 +17,21 @@ namespace MDPro3
{
public int id;
public string m_name;
bool nameLoaded;
bool descriptionLoaded;
public string name
{
get
{
if (!diy)
m_name = instace.GetName(id);
if (!diy && !nameLoaded)
{
var listName = instance.GetName(id);
if(listName != nullString)
m_name = instance.GetName(id);
if(string.IsNullOrEmpty(m_name))
m_name = nullString;
nameLoaded = true;
}
return m_name;
}
set
......@@ -35,8 +44,20 @@ namespace MDPro3
{
get
{
if (!diy)
m_description = instace.GetDescription(id);
if (!diy && !descriptionLoaded)
{
var listDescription = instance.GetDescription(id);
if(listDescription != nullString)
m_description = listDescription;
if(string.IsNullOrEmpty(m_description))
m_description = nullString;
descriptionLoaded = true;
}
if(diy && !descriptionLoaded)
{
if(m_description.Contains("@"))
m_description = InterString.Get("ɡ[?]Ͷ塣", m_description);
}
return m_description;
}
set
......@@ -66,10 +87,10 @@ namespace MDPro3
Dictionary<int, string> names = new Dictionary<int, string>();
Dictionary<int, string> descriptions = new Dictionary<int, string>();
static Items instace;
static Items instance;
public void Initialize()
{
instace = this;
instance = this;
kinds = new List<List<Item>>()
{
wallpapers,
......
Assets/Scripts/MDPro3/Duel/CoreWrapper.cs
View file @ a86eb9b3
using Meisui.Random;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using UnityEngine;
using Meisui.Random;
using System.Linq;
namespace Percy
{
......@@ -1141,7 +1140,7 @@ namespace Percy
private void AddDeck(Deck deck, int playerId, bool random)
{
if(random)
if (random)
{
var seed = new System.Random();
for (var i = 0; i < deck.Main.Count; i++)
......@@ -1165,37 +1164,6 @@ namespace Percy
AddDeck(FromYDKtoDeck(playerDek), playerId, random);
}
public bool StartDuel(string player0Deck, string player1Deck, bool player0GoFirst, bool random, int life, bool god, int mr, int hand, int draw)
{
try
{
godMode = god;
isFirst = player0GoFirst;
Dll.set_player_info(duel, 0, life, hand, draw);
Dll.set_player_info(duel, 1, life, hand, draw);
AddDeckFromFile(player0Deck, isFirst ? 0 : 1, random);
AddDeckFromFile(player1Deck, isFirst ? 1 : 0, random);
var opt = 0;
opt |= 0x80;
if (!random)
opt |= 0x10;
var master = new BinaryMaster();
master.writer.Write((char)GameMessage.Start);
master.writer.Write((byte)(isFirst ? 0xf0 : 0xff));
master.writer.Write(life);
master.writer.Write(life);
master.writer.Write((ushort)Dll.query_field_count(duel, 0, 0x1));
master.writer.Write((ushort)Dll.query_field_count(duel, 0, 0x40));
master.writer.Write((ushort)Dll.query_field_count(duel, 1, 0x1));
master.writer.Write((ushort)Dll.query_field_count(duel, 1, 0x40));
sendToPlayer(master.Get());
Dll.start_duel(duel, opt | (mr << 16));
Refresh();
new Thread(Process).Start();
return true;
}
catch { return false; }
}
public bool StartPuzzle(string path)
{
godMode = true;
......@@ -1209,41 +1177,6 @@ namespace Percy
new Thread(Process).Start();
return true;
}
public bool StartAI(string playerDek, string aiDeck, string aiScript, bool playerGoFirst, bool unrand, int life, bool god, int mr)
{
godMode = god;
isFirst = playerGoFirst;
Dll.set_player_info(duel, 0, life, 5, 1);
Dll.set_player_info(duel, 1, life, 5, 1);
var reult = 0;
for (var i = 0; i < 10; i++)
{
reult = Dll.preload_script(duel, GetPtrString(aiScript), 0);
if (reult > 0) break;
}
if (reult == 0) return false;
AddDeckFromFile(playerDek, playerGoFirst ? 0 : 1, !unrand);
AddDeckFromFile(aiDeck, playerGoFirst ? 1 : 0, true);
Dll.set_ai_id(duel, playerGoFirst ? 1 : 0);
var opt = 0;
opt |= 0x80;
if (unrand) opt |= 0x10;
var master = new BinaryMaster();
master.writer.Write((char)GameMessage.Start);
master.writer.Write((byte)(playerGoFirst ? 0xf0 : 0xff));
master.writer.Write(life);
master.writer.Write(life);
master.writer.Write((ushort)Dll.query_field_count(duel, 0, 0x1));
master.writer.Write((ushort)Dll.query_field_count(duel, 0, 0x40));
master.writer.Write((ushort)Dll.query_field_count(duel, 1, 0x1));
master.writer.Write((ushort)Dll.query_field_count(duel, 1, 0x40));
sendToPlayer(master.Get());
Dll.start_duel(duel, opt | (mr << 16));
Refresh();
new Thread(Process).Start();
return true;
}
public void Response(byte[] resp)
{
if (resp.Length > 64) return;
......
Assets/Scripts/MDPro3/Servants/OcgCore.cs
View file @ a86eb9b3
......@@ -4980,7 +4980,8 @@ namespace MDPro3
ShowPopupInput(selections, OnAnnounceCard, null);
break;
case GameMessage.SelectIdleCmd:
if (InIgnoranceReplay()) break;
if (InIgnoranceReplay())
break;
player = LocalPlayer(r.ReadChar());
count = r.ReadByte();
......
Assets/Texture/Texture_Other/AppIcon.png.meta
View file @ a86eb9b3
......@@ -50,7 +50,7 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
......
Assets/Texture/Texture_Other/UnknownArt.png.meta
View file @ a86eb9b3
......@@ -20,7 +20,7 @@ TextureImporter:
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
......
Assets/Texture/Texture_Other/UnknownCard.png.meta
View file @ a86eb9b3
......@@ -20,7 +20,7 @@ TextureImporter:
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
......
Assets/Wallpaper.meta 0 → 100644
View file @ a86eb9b3
fileFormatVersion: 2
guid: 02cdc0772c502d6468e46569bfeb0cfe
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Data/locales/en-US/translation.conf
View file @ a86eb9b3
......@@ -532,3 +532,16 @@ Off->Off
祭神 莫多丽娜->Modorina the Light Retriever
当方英雄->Hero of the Yeast
背景->背景
设置游戏中的背景->设置游戏中的背景
WCS->WCS
玩家消息->玩家消息
决斗中的玩家消息->决斗中的玩家消息
系统消息->系统消息
决斗中的系统消息->决斗中的系统消息
观战中的玩家消息->观战中的玩家消息
观战中的系统消息->观战中的系统消息
回放中的玩家消息->回放中的玩家消息
回放中的系统消息->回放中的系统消息
更新内容->更新内容
查看更新内容->查看更新内容
Data/locales/zh-CN/translation.conf
View file @ a86eb9b3
......@@ -548,3 +548,4 @@ Off->Off
回放中的玩家消息->回放中的玩家消息
回放中的系统消息->回放中的系统消息
打开盖卡->打开盖卡
WCS->WCS
ProjectSettings/ProjectSettings.asset
View file @ a86eb9b3
......@@ -265,7 +265,7 @@ PlayerSettings:
androidGamepadSupportLevel: 0
chromeosInputEmulation: 1
AndroidMinifyWithR8: 0
AndroidMinifyRelease: 1
AndroidMinifyRelease: 0
AndroidMinifyDebug: 0
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
......
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