bug fix

.gitignore

@@ -32,6 +32,7 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
+*.gradle
 
 # MDPro3 Assets
 /Android/
@@ -42,6 +43,7 @@ sysinfo.txt
 /Closeup/
 /[Dd]eck/
 /[Ee]xpansions/
+/Keys/
 /[Pp]uzzle/
 /[Rr]eplay/
 /StandaloneWindows64/

Assets/Addressables/Text/UpdateContent.txt

@@ -6,12 +6,15 @@ MDPro3 v1.1.0更新：
 4.现在非闪卡卡面也有圆角了、更加还原的镜碎特效。
 5.现在能查看未知卡片了。
 6.现在选择卡片框也支持鼠标滚轮翻页了。
-7.现在能修改人机时的端口了。
-8.新投稿动画：元素英雄 水手侠、元素英雄 永生侠、命运英雄 恐惧人。
-9.连接箭头默认不再显示在立绘之上。
-10.修复开启立绘后，对方的连接怪兽连接箭头方向与预期相反的错误。
-11.修复选择表示形式时，里侧守备表示的选项为纯白的错误。
-12.修复英语、西班牙语、繁体中文下，灵摆卡片描述文字没有被正确分割的错误。
+7.现在能修改本地人机时的端口了。
+8.现在能开关右上角的弹窗消息了。
+9.新投稿动画：元素英雄 水手侠、元素英雄 永生侠、命运英雄 恐惧人。
+10.连接箭头默认不再显示在立绘之上。
+11.修复开启立绘后，对方的连接怪兽连接箭头方向与预期相反的错误。
+12.修复选择表示形式时，里侧守备表示的选项为纯白的错误。
+13.修复英语、西班牙语、繁体中文下，灵摆卡片描述文字没有被正确分割的错误。
+14.修复融合素材多次移动时（如珠泪），部分情况下融合特效卡图为未知卡图的错误。
+15.修复使用Esc键取消发动效果时，游戏报错、不能继续决斗的错误。
 
 MDPro3 v1.0.9更新：
 1.设置中新增了超先行卡的一键下载功能。

Assets/Main.unity

@@ -2684,8 +2684,8 @@ RectTransform:
   m_Father: {fileID: 161599999}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.52}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0.48}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -7245,7 +7245,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -399.99988, y: 0}
+  m_AnchoredPosition: {x: -399.99982, y: 0}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &129642814
@@ -8168,7 +8168,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: -490.00037, y: 0}
+  m_AnchoredPosition: {x: -490.0003, y: 0}
   m_SizeDelta: {x: 490, y: 2000}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &153416284
@@ -10576,7 +10576,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: 247.49988, y: -540}
+  m_AnchoredPosition: {x: 247.49982, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &203992981
@@ -13618,7 +13618,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: 247.49988, y: -540}
+  m_AnchoredPosition: {x: 247.49982, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &250597853
@@ -16872,7 +16872,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: 247.49988, y: -540}
+  m_AnchoredPosition: {x: 247.49982, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &296823158
@@ -17920,11 +17920,11 @@ RectTransform:
   m_Children:
   - {fileID: 2132612656}
   m_Father: {fileID: 1527842774}
-  m_RootOrder: 14
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 10, y: -1930}
+  m_AnchoredPosition: {x: 10, y: -1780}
   m_SizeDelta: {x: -50, y: 140}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &329771330
@@ -19227,7 +19227,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -399.99988, y: 300}
+  m_AnchoredPosition: {x: -399.99982, y: 300}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &365844423
@@ -36900,11 +36900,11 @@ RectTransform:
   m_Children:
   - {fileID: 1544225214}
   m_Father: {fileID: 1527842774}
-  m_RootOrder: 13
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 10, y: -1780}
+  m_AnchoredPosition: {x: 10, y: -1630}
   m_SizeDelta: {x: -50, y: 140}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &675901759
@@ -37454,7 +37454,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: 247.49988, y: -540}
+  m_AnchoredPosition: {x: 247.49982, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &681567863
@@ -40185,7 +40185,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -419.99988, y: -60}
+  m_AnchoredPosition: {x: -419.99982, y: -60}
   m_SizeDelta: {x: 400, y: 760}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &736958434
@@ -41190,11 +41190,11 @@ RectTransform:
   m_Children:
   - {fileID: 1726285853}
   m_Father: {fileID: 1527842774}
-  m_RootOrder: 12
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 10, y: -1630}
+  m_AnchoredPosition: {x: 10, y: -1930}
   m_SizeDelta: {x: -50, y: 140}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &770936057
@@ -41734,7 +41734,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 476827028}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.5774225
+  m_Size: 0.5965564
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -54174,7 +54174,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 399.99988, y: -132}
+  m_AnchoredPosition: {x: 399.99982, y: -132}
   m_SizeDelta: {x: 330, y: 840}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &998933908
@@ -54635,7 +54635,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: 247.49988, y: -540}
+  m_AnchoredPosition: {x: 247.49982, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1005556390
@@ -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.000030517578}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!1 &1117266860
@@ -73199,7 +73199,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: 247.49988, y: -540}
+  m_AnchoredPosition: {x: 247.49982, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1371617110
@@ -73351,7 +73351,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -399.99988, y: 150}
+  m_AnchoredPosition: {x: -399.99982, y: 150}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &1374530642
@@ -83434,16 +83434,16 @@ RectTransform:
   - {fileID: 162255790}
   - {fileID: 1996221961}
   - {fileID: 285815059}
-  - {fileID: 770936056}
   - {fileID: 675901758}
   - {fileID: 329771329}
+  - {fileID: 770936056}
   - {fileID: 1666306112}
   m_Father: {fileID: 531886762}
   m_RootOrder: 0
   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: 1170}
   m_SizeDelta: {x: 0, y: 2250}
   m_Pivot: {x: 0, y: 1}
 --- !u!1 &1532403001
@@ -98695,7 +98695,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -399.99988, y: -150}
+  m_AnchoredPosition: {x: -399.99982, y: -150}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &1800729521
@@ -103841,7 +103841,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: 247.49988, y: -540}
+  m_AnchoredPosition: {x: 247.49982, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1895460095
@@ -115666,9 +115666,9 @@ GameObject:
   m_Component:
   - component: {fileID: 2109191436}
   - component: {fileID: 2109191440}
-  - component: {fileID: 2109191439}
   - component: {fileID: 2109191438}
   - component: {fileID: 2109191437}
+  - component: {fileID: 2109191439}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
@@ -115742,8 +115742,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 25
-  m_fontSizeBase: 25
+  m_fontSize: 26
+  m_fontSizeBase: 26
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -115752,11 +115752,11 @@ MonoBehaviour:
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 256
   m_textAlignment: 65535
-  m_characterSpacing: 0
+  m_characterSpacing: 5
   m_wordSpacing: 0
   m_lineSpacing: -20
   m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
+  m_paragraphSpacing: 40
   m_charWidthMaxAdj: 0
   m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4

Assets/Plugins/Android/mainTemplate.gradle.DISABLED.meta

 fileFormatVersion: 2
-guid: e63635bc7e5c63a48bf3e94ff30035dd
+guid: 84d3a3383e6e37e41930813c59de5776
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scripts/MDPro3/Duel/GameCard.cs

@@ -323,7 +323,8 @@ namespace MDPro3
         }
         public Card CacheData()
         {
-            cachedData = data.Clone();
+            if(data.Id > 0)
+                cachedData = data.Clone();
             return cachedData;
         }
         public Card GetCachedData()
@@ -1164,7 +1165,7 @@ namespace MDPro3
                     case GameMessage.Draw:
                         if (p.controller == 0)
                         {
-                            moveTime = 0.5f;
+                            moveTime = 0.6f;
                             handAppeal = true;
                         }
                         else

Assets/Scripts/MDPro3/Managers/TimeLineManager.cs

@@ -97,6 +97,8 @@ namespace MDPro3
                 var dummyCard = manager.GetElement<ElementObjectManager>("DummyCard0" + (i + 1).ToString());
                 var renderer = dummyCard.GetElement<Renderer>("DummyCardModel_front");
                 var code = materials[i].GetData().Id;
+                if (code == 0)
+                    code = materials[i].GetCachedData().Id;
                 StartCoroutine(RefreshCardFace(renderer, code));
 
                 var cardBack01 = dummyCard.transform.parent.GetChild(0).GetComponent<ParticleSystem>().main;
@@ -602,7 +604,10 @@ namespace MDPro3
                 var materials = Program.I().ocgcore.materialCards;
                 for (int i = 0; i < count; i++)
                 {
-                    var ie = Program.I().texture_.LoadCardAsync(materials[i + order].GetData().Id);
+                    var code = materials[i + order].GetData().Id;
+                    if(code == 0)
+                        code = materials[i + order].GetCachedData().Id;
+                    var ie = Program.I().texture_.LoadCardAsync(code);
                     StartCoroutine(ie);
                     while (ie.MoveNext())
                         yield return null;

Assets/Scripts/MDPro3/Servants/Appearance.cs

@@ -727,7 +727,7 @@ namespace MDPro3
                     for (int i = 0; i < files.Length; i++)
                     {
                         int code = int.Parse(files[i].Name.Replace(".bundle", ""));
-                        var card = CardsManager.Get(code);
+                        var card = CardsManager.Get(code, true);
                         GameObject item = Instantiate(appearanceItem);
                         AppearanceItem itemMono = item.GetComponent<AppearanceItem>();
                         itemMono.id = i + targetItems.Count;

Assets/Scripts/MDPro3/Servants/MateView.cs

@@ -57,7 +57,7 @@ namespace MDPro3
             cards.Clear();
             for (int i = 0; i < crossDuelMates.Count; i++)
             {
-                var card = CardsManager.Get(crossDuelMates[i]);
+                var card = CardsManager.Get(crossDuelMates[i], true);
                 if (card.Id == 0)
                 {
                     card.Id = crossDuelMates[i];

Assets/Scripts/MDPro3/Servants/OcgCore.cs

@@ -542,7 +542,7 @@ namespace MDPro3
                 #endregion
 
                 #region Hot Key
-                if (Program.InputGetMouse1Up || Input.GetKey(KeyCode.Escape))
+                if (Program.InputGetMouse1Up || Input.GetKeyUp(KeyCode.Escape))
                 {
                     if (detail.showing)
                         detail.Hide();
@@ -2060,13 +2060,14 @@ namespace MDPro3
                 case GameMessage.PosChange:
                     code = r.ReadInt32();
                     from = r.ReadGPS();
-                    if ((from.location & (uint)CardLocation.SpellZone) > 0
-                        && (from.position & (uint)CardPosition.FaceDown) > 0)
-                        break;
+
                     textReason = InterString.Get("更改表示形式");
                     if ((from.location & (uint)CardLocation.SpellZone) > 0
                         && (from.position & (uint)CardPosition.FaceUp) > 0)
                         textReason = InterString.Get("盖放");
+                    if ((from.location & (uint)CardLocation.SpellZone) > 0
+                        && (from.position & (uint)CardPosition.FaceDown) > 0)
+                        textReason = InterString.Get("打开盖卡");
                     to = from;
                     to.position = r.ReadByte();
                     if(code == 0)

Assets/Scripts/MDPro3/Servants/Room.cs

@@ -130,6 +130,8 @@ namespace MDPro3
             OnResize();
             right.gameObject.GetComponent<CanvasGroup>().alpha = 1;
             right.DOAnchorPosX(0, moveTime).OnComplete(() => chatSwitching = false);
+            if(!isShowed)
+                chatInput.Select();
         }
 
         public void ChatOff(float moveTime)

Assets/Texture/Texture_Other/AppIcon.png.meta

+fileFormatVersion: 2
+guid: 8f94527436f4c6441b7c04ec0732b6e3
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Data/locales/zh-CN/translation.conf

@@ -547,3 +547,4 @@ Off->Off
 观战中的系统消息->观战中的系统消息
 回放中的玩家消息->回放中的玩家消息
 回放中的系统消息->回放中的系统消息
+打开盖卡->打开盖卡

ProjectSettings/ProjectSettings.asset

@@ -163,7 +163,7 @@ PlayerSettings:
     tvOS: 0
   overrideDefaultApplicationIdentifier: 0
   AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 23
+  AndroidMinSdkVersion: 28
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 0
   aotOptions: 
@@ -249,7 +249,7 @@ PlayerSettings:
   AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
-  AndroidKeystoreName: D:/Program/Unity/Key/user.keystore
+  AndroidKeystoreName: '{inproject}: Keys/MDPro3.keystore'
   AndroidKeyaliasName: sherrychaos
   AndroidBuildApkPerCpuArchitecture: 0
   AndroidTVCompatibility: 0
@@ -257,7 +257,7 @@ PlayerSettings:
   AndroidEnableTango: 0
   androidEnableBanner: 1
   androidUseLowAccuracyLocation: 0
-  androidUseCustomKeystore: 0
+  androidUseCustomKeystore: 1
   m_AndroidBanners:
   - width: 320
     height: 180
@@ -265,7 +265,7 @@ PlayerSettings:
   androidGamepadSupportLevel: 0
   chromeosInputEmulation: 1
   AndroidMinifyWithR8: 0
-  AndroidMinifyRelease: 0
+  AndroidMinifyRelease: 1
   AndroidMinifyDebug: 0
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
@@ -273,43 +273,13 @@ PlayerSettings:
   - m_BuildTarget: 
     m_Icons:
     - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: ed39a2f11c4808147b175ad329506671, type: 3}
+      m_Icon: {fileID: 2800000, guid: 8f94527436f4c6441b7c04ec0732b6e3, type: 3}
       m_Width: 128
       m_Height: 128
       m_Kind: 0
   m_BuildTargetPlatformIcons:
   - m_BuildTarget: Android
     m_Icons:
-    - m_Textures: []
-      m_Width: 432
-      m_Height: 432
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 324
-      m_Height: 324
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 216
-      m_Height: 216
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 162
-      m_Height: 162
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 108
-      m_Height: 108
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 81
-      m_Height: 81
-      m_Kind: 2
-      m_SubKind: 
     - m_Textures: []
       m_Width: 192
       m_Height: 192
@@ -370,6 +340,36 @@ PlayerSettings:
       m_Height: 36
       m_Kind: 0
       m_SubKind: 
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
   - m_BuildTarget: iPhone
     m_Icons:
     - m_Textures: []
@@ -529,7 +529,7 @@ PlayerSettings:
     m_APIs: 0b000000
     m_Automatic: 1
   - m_BuildTarget: WindowsStandaloneSupport
-    m_APIs: 020000000b000000
+    m_APIs: 0b00000002000000
     m_Automatic: 0
   m_BuildTargetVRSettings:
   - m_BuildTarget: Standalone