UI Update V6

Assets/ArtSystem/Setting/LAZYsetting.cs

@@ -36,6 +36,7 @@ public class LAZYsetting : MonoBehaviour
     public UIToggle hand;
     public UIToggle handm;
     public UIToggle spyer;
+    public UIToggle confirmLeft;
     public UILabel character0;
     public UILabel character1;
     public UILabel field0;

Assets/ArtSystem/deckManager/cardPicLoader.cs

@@ -10,6 +10,7 @@ public class cardPicLoader : MonoBehaviour
     public UITexture uiTexture;
     public Banlist loaded_banlist;
     public Card data { get; set; }
+    public int player;
     public int code
     {
         get => _code;
@@ -22,7 +23,7 @@ public class cardPicLoader : MonoBehaviour
 
     private async void LoadCard()
     {
-        uiTexture.mainTexture = await GameTextureManager.GetCardPicture(code);
+        uiTexture.mainTexture = await GameTextureManager.GetCardPicture(code, player);
         if (uiTexture.mainTexture == null) return;
         //uiTexture.aspectRatio = (float) uiTexture.mainTexture.width / uiTexture.mainTexture.height;
         //uiTexture.forceWidth((int) (uiTexture.height * uiTexture.aspectRatio));
@@ -32,7 +33,7 @@ public class cardPicLoader : MonoBehaviour
     private void Update()
     {
         if (coli != null && Program.InputGetMouseButtonDown_0 && Program.pointedCollider == coli)
-            Program.I().cardDescription.setData(CardsManager.Get(_code), GameTextureManager.myBack, "", true);
+            Program.I().cardDescription.setData(CardsManager.Get(_code), player == 0 ? GameTextureManager.myBack : GameTextureManager.opBack, "", true);
         if (Program.I().deckManager != null)
         {
             if (loaded_banlist != Program.I().deckManager.currentBanlist)

Assets/ArtSystem/superButton/new_superButton.prefab

@@ -181,6 +181,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   audioClip: {fileID: 8300000, guid: ae3d99ac8f0551f47a359c3411a82339, type: 3}
   trigger: 0
+  type: 0
   volume: 1
   pitch: 1
 --- !u!114 &8547163507876947566
@@ -216,7 +217,7 @@ MonoBehaviour:
   mPivot: 4
   mWidth: 100
   mHeight: 100
-  mDepth: 0
+  mDepth: 20
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
@@ -302,7 +303,7 @@ MonoBehaviour:
   mPivot: 1
   mWidth: 100
   mHeight: 45
-  mDepth: 24
+  mDepth: 10
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0

Assets/ArtSystem/大逆转谜题.png.meta

+fileFormatVersion: 2
+guid: 8c1c810aa874ac6479c4e2ee22638d2b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/DuelLinks/CharacterButton.cs

@@ -9,7 +9,7 @@ public class CharacterButton : MonoBehaviour
     UI2DSprite mark;
     public bool selected;
     public string character;
-    void Start()
+    void Awake()
     {
         button = GetComponent<UIButton>();
         EventDelegate.Add(button.onClick, SelectThis);

Assets/MD/DuelLinks/CharacterSelect.cs

@@ -41,6 +41,11 @@ public class CharacterSelect : MonoBehaviour
         EventDelegate.Add(UIHelper.getByName<UIButton>(gameObject, "exit_").onClick, Hide);
     }
 
+    private void Start()
+    {
+        gameObject.SetActive(false);
+    }
+
     public void Show(int player = 0)
     {
         isShowed = true;
@@ -89,6 +94,7 @@ public class CharacterSelect : MonoBehaviour
         SEHandler.PlayInternalAudio("se_sys/SE_MENU_SLIDE_04");
 
         SaveChange();
+        gameObject.SetActive(false);
     }
 
     public void RefreshSelectedSerialButton(SerialButton btn)

Assets/MD/DuelLinks/SerialButton.cs

@@ -10,7 +10,7 @@ public class SerialButton : MonoBehaviour
 
     public bool selected;
     bool hover;
-    private void Start()
+    private void Awake()
     {
         collider = GetComponent<Collider>();
         sprite = GetComponent<UI2DSprite>();

Assets/MD/Materials/Mat_sprite_mask_airoom.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Mat_sprite_mask_airoom
+  m_Shader: {fileID: 4800000, guid: 9300d87db4ad0b0439f6fb97c3ce8ccf, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Mask:
+        m_Texture: {fileID: 2800000, guid: f218a9ee384f6d14eb6dfea4907add53, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _HeightRate: 1
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Surface: 0
+    - _WidthRate: 1
+    - _WorkflowMode: 1
+    - _XOffset: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+--- !u!114 &7071352862730582035
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 4

Assets/MD/Materials/Mat_sprite_mask_airoom.mat.meta

+fileFormatVersion: 2
+guid: eff789c2160e2d744820d2f2ee9b0177
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Prefabs/trans_appearance.prefab.meta

+fileFormatVersion: 2
+guid: 9f2b69dc819e68e4f8efd13d93c1a4a4
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Scripts/CardOnSelection.cs

@@ -37,14 +37,14 @@ public class CardOnSelection : MonoBehaviour
     {
         this.card = card;
         this.sort = sort;
-        go = Instantiate(Program.I().new_ui_cardSelection.cardOnSelectionPrefab);
-        go.transform.parent = Program.I().new_ui_cardSelection.list;
+        go = Instantiate(Program.I().cardSelection.cardOnSelectionPrefab);
+        go.transform.parent = Program.I().cardSelection.list;
         go.transform.localPosition = Vector3.zero;
         go.transform.localRotation = Quaternion.identity;
         go.transform.localScale = Vector3.one;
 
         cardListHandler = Program.I().new_ui_cardList;
-        cardSelectionHandler = Program.I().new_ui_cardSelection;
+        cardSelectionHandler = Program.I().cardSelection;
 
         pic = go.transform.GetChild(2).GetComponent<UITexture>();
         pic.mainTexture = card.gameObject_face.GetComponent<Renderer>().material.mainTexture;
@@ -82,17 +82,17 @@ public class CardOnSelection : MonoBehaviour
 
         icon_location = go.transform.GetChild(1).GetComponent<UI2DSprite>();
         if((card.p.location & (uint)CardLocation.Deck) > 0)
-            icon_location.sprite2D = Program.I().new_ui_cardSelection.deck;
+            icon_location.sprite2D = Program.I().cardSelection.deck;
         else if ((card.p.location & (uint)CardLocation.Hand) > 0)
-            icon_location.sprite2D = Program.I().new_ui_cardSelection.hand;
+            icon_location.sprite2D = Program.I().cardSelection.hand;
         else if ((card.p.location & (uint)CardLocation.Extra) > 0)
-            icon_location.sprite2D = Program.I().new_ui_cardSelection.extra;
+            icon_location.sprite2D = Program.I().cardSelection.extra;
         else if ((card.p.location & (uint)CardLocation.Removed) > 0)
-            icon_location.sprite2D = Program.I().new_ui_cardSelection.exclude;
+            icon_location.sprite2D = Program.I().cardSelection.exclude;
         else if ((card.p.location & (uint)CardLocation.Grave) > 0)
-            icon_location.sprite2D = Program.I().new_ui_cardSelection.grave;
+            icon_location.sprite2D = Program.I().cardSelection.grave;
         else if ((card.p.location & (uint)CardLocation.Onfield) > 0)
-            icon_location.sprite2D = Program.I().new_ui_cardSelection.field;
+            icon_location.sprite2D = Program.I().cardSelection.field;
 
         icon_base = icon_location.transform.GetChild(0).GetComponent<UI2DSprite>();
         background = go.transform.GetChild(0).GetComponent<UI2DSprite>();

Assets/MD/Scripts/CardSelectionHandler.cs

@@ -197,6 +197,10 @@ public class CardSelectionHandler : MonoBehaviour
             binaryMaster.writer.Write(0);
             core.sendReturn(binaryMaster.get());
         }
+        if (core.currentMessage == GameMessage.AnnounceCard)
+        {
+            Program.I().ocgcore.RMSshow_input("AnnounceCard", InterString.Get("请输入关键字："), "");
+        }
     }
 
     void HideWithoutAction()
@@ -287,6 +291,7 @@ public class CardSelectionHandler : MonoBehaviour
                     }
                 }
                 break;
+            case GameMessage.SelectBattleCmd:
             case GameMessage.SelectIdleCmd:
                 foreach (var card in cardsOnSelection)
                     if (card.selected)
@@ -308,6 +313,18 @@ public class CardSelectionHandler : MonoBehaviour
                         core.cardsSelected.Add(card.card);
                 core.realizeCardsForSelect();
                 break;
+            case GameMessage.AnnounceCard:
+                foreach(var card in cardsOnSelection)
+                {
+                    if (card.selected)
+                    {
+                        binaryMaster = new BinaryMaster();
+                        binaryMaster.writer.Write((uint)card.card.get_data().Id);
+                        core.sendReturn(binaryMaster.get());
+                        break;
+                    }
+                }
+                break;
             default:
                 foreach (var card in cardsOnSelection)
                     if (card.selected && !card.alreadySelected)

Assets/MD/Scripts/LoadAssets.cs

@@ -343,7 +343,7 @@ public class LoadAssets : MonoBehaviour
                 case "夜晚的摩天楼": return "009";
                 case "冰封的世界": return "010";
                 case "荒野的神殿": return "011";
-                case "未界域-欧玛利亚大陆": return "012";
+                case "未界域–欧玛利亚大陆": return "012";
                 case "相剑的灵峰": return "014";
                 case "生机盎然的碧蓝大海": return "015";
                 case "魔法甜点城堡": return "016";
@@ -379,7 +379,7 @@ public class LoadAssets : MonoBehaviour
                 case "夜晚的摩天楼": return "009";
                 case "冰封的世界": return "010";
                 case "荒野的神殿": return "011";
-                case "未界域-欧玛利亚大陆": return "012";
+                case "未界域–欧玛利亚大陆": return "012";
                 case "相剑的灵峰": return "014";
                 case "生机盎然的碧蓝大海": return "015";
                 case "魔法甜点城堡": return "016";
@@ -427,7 +427,7 @@ public class LoadAssets : MonoBehaviour
                 case "夜晚的摩天楼": return "009";
                 case "冰封的世界": return "010";
                 case "荒野的神殿": return "011";
-                case "未界域-欧玛利亚大陆": return "012";
+                case "未界域–欧玛利亚大陆": return "012";
                 case "相剑的灵峰": return "014";
                 case "生机盎然的碧蓝大海": return "015";
                 case "魔法甜点城堡": return "016";
@@ -502,8 +502,8 @@ public class LoadAssets : MonoBehaviour
                 case "全新的生命-伽拉忒亚-": return "m13636_model";
                 case "未界域之鹿角兔": return "m13981_model";
                 case "转生炎兽 羚羊": return "m14240_model";
-                case "半龙女仆·清扫龙女": return "m14759_model";
-                case "半龙女仆·芙流丝": return "m14760_model";
+                case "龙女仆·清扫龙女": return "m14759_model";
+                case "龙女仆·芙流丝": return "m14760_model";
                 case "白骨烤王": return "m15726_model";
                 case "鲑鱼子军贯": return "m16201_model";
                 case "雷灵放电·蓝": return "m17405_model";

Assets/MD/Scripts/SetHintPosition.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SetHintPosition : MonoBehaviour
+{
+    public Collider collider;
+    bool up;
+    bool hover;
+    void OnEnable()
+    {
+        gameObject.transform.localPosition = new Vector3(0, 280, 0);
+        up = true;
+        hover = false;
+    }
+
+    void Update()
+    {
+        if (Program.pointedCollider == collider)
+        {
+            if (!hover)
+            {
+                hover = true;
+                if (up)
+                {
+                    up = false;
+                    gameObject.transform.localPosition = new Vector3(0, -260, 0);
+                }
+                else
+                {
+                    up = true;
+                    gameObject.transform.localPosition = new Vector3(0, 280, 0);
+                }
+            }
+        }
+        else
+            hover = false;
+
+    }
+}

Assets/MD/Scripts/SetHintPosition.cs.meta

+fileFormatVersion: 2
+guid: b2885080313b8b1428a1cd60ef90921c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Scripts/Shortcuts.cs

@@ -40,6 +40,11 @@ public class Shortcuts : MonoBehaviour
                 Program.I().setting.hide();
             else if (PhaseUIBehaviour.isShowed)
                 PhaseUIBehaviour.hide();
+            else if (Program.I().aiRoom.isShowed)
+            {
+                Program.I().shiftToServant(Program.I().menu);
+                UIHandler.OpenHomeUI();
+            }
             else
             {
                 Program.I().setting.show();
@@ -54,22 +59,28 @@ public class Shortcuts : MonoBehaviour
                 Program.I().appearance.Hide();
             else if (Program.I().setting.isShowed)
                 Program.I().setting.hide();
-            else if (Program.I().new_ui_cardSelection.isShowed && Program.I().new_ui_cardSelection.exitable)
-                Program.I().new_ui_cardSelection.hide();
+            else if (Program.I().cardSelection.isShowed && Program.I().cardSelection.exitable)
+                Program.I().cardSelection.hide();
             else if (PhaseUIBehaviour.isShowed)
                 PhaseUIBehaviour.hide();
-        }
 
-        if (Input.GetKeyUp(KeyCode.F2))
-        {
-            if (Program.I().setting.isShowed)
+            if (Program.I().aiRoom.isShowed)
             {
-                Program.I().setting.hide();
+                Program.I().shiftToServant(Program.I().menu);
+                UIHandler.OpenHomeUI();
             }
-            else
-                Program.I().setting.show();
         }
 
+        //if (Input.GetKeyUp(KeyCode.F2))
+        //{
+        //    if (Program.I().setting.isShowed)
+        //    {
+        //        Program.I().setting.hide();
+        //    }
+        //    else
+        //        Program.I().setting.show();
+        //}
+
         if (Input.GetKeyUp(KeyCode.F4))
         {
             if(Program.I().cardDescription.isShowed)
@@ -103,37 +114,37 @@ public class Shortcuts : MonoBehaviour
                 
             hasChanged = true;
         }
-        if (Input.GetKeyDown(KeyCode.F6))
-        {
-            if (lockCamera)
-            {
-                lockCamera = false;
-                Program.PrintToChat(InterString.Get("解锁镜头"));
-            }
-            else
-            {
-                lockCamera = true;
-                Program.PrintToChat(InterString.Get("锁定镜头"));
-            }
-                
-        }
-        if (Input.GetKeyDown(KeyCode.F7))
-        {
-            if (lineShift)
-            {
-                lineShift = false;
-                Program.PrintToChat(InterString.Get("卡片下方展示"));
-                Program.I().ocgcore.realize();
-                Program.I().ocgcore.toNearest();
-            }
-            else
-            {
-                lineShift = true;
-                Program.PrintToChat(InterString.Get("卡片上方展示"));
-                Program.I().ocgcore.realize();
-                Program.I().ocgcore.toNearest();
-            }
-        }
+        //if (Input.GetKeyDown(KeyCode.F6))
+        //{
+        //    if (lockCamera)
+        //    {
+        //        lockCamera = false;
+        //        Program.PrintToChat(InterString.Get("解锁镜头"));
+        //    }
+        //    else
+        //    {
+        //        lockCamera = true;
+        //        Program.PrintToChat(InterString.Get("锁定镜头"));
+        //    }
+        //}
+
+        //if (Input.GetKeyDown(KeyCode.F7))
+        //{
+        //    if (lineShift)
+        //    {
+        //        lineShift = false;
+        //        Program.PrintToChat(InterString.Get("卡片下方展示"));
+        //        Program.I().ocgcore.realize();
+        //        Program.I().ocgcore.toNearest();
+        //    }
+        //    else
+        //    {
+        //        lineShift = true;
+        //        Program.PrintToChat(InterString.Get("卡片上方展示"));
+        //        Program.I().ocgcore.realize();
+        //        Program.I().ocgcore.toNearest();
+        //    }
+        //}
 
 
         if (hasChanged)
@@ -173,7 +184,7 @@ public class Shortcuts : MonoBehaviour
             hasChanged = false;
         }
 
-        Time.timeScale = timescale;
+        //Time.timeScale = timescale;
         //if (message != Program.I().ocgcore.currentMessage)
         //{
         //    message = Program.I().ocgcore.currentMessage;

Assets/MD/Texture/mask_airoom.png.meta

+fileFormatVersion: 2
+guid: f218a9ee384f6d14eb6dfea4907add53
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/SibylSystem/CardDescription/CardDescription.cs

@@ -221,10 +221,9 @@ public class CardDescription : Servant
         return currentCard == card;
     }
 
-    private void apply(Card card, Texture2D def, string tail)
+    private void apply(Card card, Texture2D def, string tail, int player =0)
     {
         this.card = card;
-        if (card == null) return;
         if (!isShowed & !forcedClosed)
             show();
 
@@ -250,6 +249,7 @@ public class CardDescription : Servant
         }
         else 
             id_label.text = "";
+        picLoader.player = player;
         picLoader.code = card.Id;
         picLoader.defaults = def;
         currentCard = card;
@@ -832,13 +832,13 @@ public class CardDescription : Servant
         }
     }
 
-    public void setData(Card card, Texture2D def, string tail = "", bool force = false)
+    public void setData(Card card, Texture2D def, string tail = "", bool force = false, int player =0)
     {
         if (cardShowerWidget.alpha == 0 && force == false) return;
         if (card == null) return;
         if (card.Id == 0)
         {
-            apply(card, def, tail);
+            apply(card, def, tail, player);
             return;
         }
 

Assets/SibylSystem/Menu/Menu.cs

@@ -29,7 +29,7 @@ public class Menu : WindowServantSP
         UIHelper.registEvent(gameObject, "ai_", onClickAI);
         UIHelper.registEvent(gameObject, "exit_", onClickExit);
         //MDPRO2 update
-        UIHelper.getByName<UILabel>(gameObject, "version_").text = "1.7.8";
+        UIHelper.getByName<UILabel>(gameObject, "version_").text = "1.7.9";
         Program.I().StartCoroutine(checkUpdate());
     }
 
@@ -121,6 +121,7 @@ public class Menu : WindowServantSP
     private void onClickAI()
     {
         Program.I().shiftToServant(Program.I().aiRoom);
+        UIHandler.CloseHomeUI();
     }
 
     public static void deleteShell()

Assets/SibylSystem/Ocgcore/OCGobjects/gameButton.cs

 using DG.Tweening;
+using Percy;
 using UnityEngine;
 
 public class gameButton : OCGobject
@@ -48,18 +49,19 @@ public class gameButton : OCGobject
     {
         if(response >= 0)
             Program.I().ocgcore.ES_gameButtonClicked(this);
-        else if(response == -1)
+        else if(response == -1)//super_button
         {
             gameHiddenButton.superButonOnClick(this);
         }
-        else if (response == -2)
+        else if (response == -2)//btn_confirm
         {
             Program.I().ocgcore.sendSelectedCards();
             Program.I().ocgcore.gameField.btn_decide.hide();
             Program.I().ocgcore.gameField.btn_confirm.hide();
             Program.I().ocgcore.gameField.btn_cancel.hide();
+            Program.I().cardSelection.hide();
         }
-        else if(response == -3)
+        else if(response == -3)//btn_cancel
         {
             if(hint == "取消选择" || hint == "取消连锁")
             {
@@ -81,14 +83,14 @@ public class gameButton : OCGobject
             }
             else if (hint == "重新输入")
             {
-                
+                Program.I().ocgcore.RMSshow_input("AnnounceCard", InterString.Get("请输入关键字："), "");
             }
-
             Program.I().ocgcore.gameField.btn_decide.hide();
             Program.I().ocgcore.gameField.btn_confirm.hide();
             Program.I().ocgcore.gameField.btn_cancel.hide();
+            Program.I().cardSelection.hide();
         }
-        else if(response == -4)
+        else if(response == -4)//btn_decide
         {
             Program.I().ocgcore.ES_cardClickedAndConfirmed(cookieCard);
             hide();

Assets/SibylSystem/Ocgcore/OCGobjects/gameCard.cs

@@ -215,7 +215,7 @@ public class gameCard : OCGobject
         cardAnimation = gameObject.GetComponent<CardAnimation>();
         cardAnimation.card = this;
     }
-
+    public bool alreadyYellow;
     public bool highlightOn;
     bool highlightYellow;
     public void Highlight(bool on, bool yellow, bool clicked)
@@ -624,7 +624,11 @@ public class gameCard : OCGobject
 
     private void RefreshFunction_ES()
     {
-        if (Program.InputGetMouseButtonUp_0 && ES_mouse_check()) Program.I().ocgcore.ES_cardClicked(this);
+        if (Program.InputGetMouseButtonUp_0 && ES_mouse_check())
+        {
+            Program.I().ocgcore.ES_cardClicked(this);
+        }
+            
         if (ES_excited_unsafe_should_not_be_changed_dont_touch_this)
         {
             //当前在excited态
@@ -658,7 +662,7 @@ public class gameCard : OCGobject
         if (ES_excited_unsafe_should_not_be_changed_dont_touch_this)
         {
             ES_excited_handler_close_up_handler();
-            if(Program.InputGetMouseButtonUp_0 && !clicked && !forSelect)
+            if(Program.InputGetMouseButtonUp_0 && !clicked)
                 ES_enter_clicked();
                 
             //ES_excited_handler_event_cookie_card_bed();
@@ -669,7 +673,7 @@ public class gameCard : OCGobject
 
     private void ES_clicked_handler()
     {
-        if (p.location != (uint)CardLocation.Hand)
+        if (p.location != (uint)CardLocation.Hand || forSelect)
             return;
         var screenposition = Program.I().main_camera.WorldToScreenPoint(accurate_position);
         if (p.controller == 0)
@@ -874,8 +878,7 @@ public class gameCard : OCGobject
 
     public void showMeLeft(bool force = false)
     {
-        Program.I().cardDescription.setData(data,
-            p.controller == 0 ? GameTextureManager.myBack : GameTextureManager.opBack, tails.managedString, force);
+        Program.I().cardDescription.setData(data, GameTextureManager.myBack, tails.managedString, force, (int)p.controller);
     }
 
     public void ES_exit_excited(bool move_to_original_place)
@@ -1051,10 +1054,6 @@ public class gameCard : OCGobject
 
                 if (toField)
                 {
-                    //自动展示卡片信息
-                    if (Program.I().setting.setting.spyer.value && (p.position & (uint)CardPosition.FaceUp) > 0)
-                        Program.I().cardDescription.setData(data, p.controller == 0 ? GameTextureManager.myBack : GameTextureManager.opBack, "", true);
-
                     //怪兽召唤+特殊召唤
                     if ((p.location & (uint)CardLocation.MonsterZone) > 0
                         &&
@@ -1124,6 +1123,7 @@ public class gameCard : OCGobject
 
                             cutin = true;
                             time_cutin = cutinFrames / 60f;
+                            Program.I().cardDescription.hide();
                         }
 
                         //有召唤动画
@@ -1154,6 +1154,7 @@ public class gameCard : OCGobject
                                 else if (LoadSFX.spType == "LINK")
                                     VoiceHandler.PlayFixedLine(p.controller, "LinkSummon", false);
                             }
+                            Program.I().cardDescription.hide();
                             summonAnimation = true;
                             time_voice = VoiceHandler.voiceTime;
                             time_materialShow = showUnlitCardFrames / 60f;
@@ -1387,7 +1388,6 @@ public class gameCard : OCGobject
         {
             if (exciting)
             {
-                //Debug.Log("mark3");
                 ES_safe_card_move(
                     iTween.Hash(
                         "x", pos.x,
@@ -1406,7 +1406,6 @@ public class gameCard : OCGobject
             }
             else
             {
-               // Debug.Log("mark4");
                 ES_safe_card_move(//洗手牌 抽卡
                     iTween.Hash(
                         "x", pos.x,
@@ -1428,7 +1427,7 @@ public class gameCard : OCGobject
         }
     }
 
-    public void UA_reloadCardHintPosition()//mark 卡片攻守等位置
+    public void UA_reloadCardHintPosition()
     {
         if ((p.location & (uint) CardLocation.MonsterZone) > 0 && (p.location & (uint) CardLocation.Overlay) == 0)
         {
@@ -1482,11 +1481,6 @@ public class gameCard : OCGobject
         }
     }
 
-    //private void bugOfUnity()
-    //{
-    //    this.gameObject.transform.eulerAngles = this.accurate_rotation;
-    //}
-
     public void UA_give_condition(gameCardCondition c)
     {
         if (condition != c || forceRefreshCondition)
@@ -2753,9 +2747,6 @@ public class gameCard : OCGobject
         var gravity = 0;
         switch (button.type)
         {
-            case superButtonType.attack:
-                gravity = 30;
-                break;
             case superButtonType.pendulumSummon:
                 gravity = 25;
                 break;
@@ -2765,6 +2756,9 @@ public class gameCard : OCGobject
             case superButtonType.act:
                 gravity = 20;
                 break;
+            case superButtonType.attack:
+                gravity = 19;
+                break;
             case superButtonType.spsummon:
                 gravity = 18;
                 break;

Assets/SibylSystem/Ocgcore/OCGobjects/gameField.cs

@@ -142,27 +142,36 @@ public class GameField : OCGobject
 
     public void ShowConfirmButton()
     {
-        btn_confirm.show(new Vector3(Screen.width / 2 + 350 * Screen.height / 1080, Screen.height / 2 + 45 * Screen.height / 1080, 0));
+        btn_confirm.show(new Vector3(Screen.width / 2 + 350 * Screen.height / 1080, Screen.height / 2 + 100 * Screen.height / 1080, 0));
     }
 
     public void ShowCancelButton(string hint)
     {
         btn_cancel.hint = hint;
-        btn_cancel.show(new Vector3(Screen.width / 2 - 350 * Screen.height / 1080, Screen.height / 2 + 45 * Screen.height / 1080, 0));
+        btn_cancel.show(new Vector3(Screen.width / 2 - 350 * Screen.height / 1080, Screen.height / 2 + 100 * Screen.height / 1080, 0));
     }
 
-    public void hideButtons(GameObject go = null, bool hideDecideButton = true)
+    public void hideSpButtons(GameObject go = null, bool hideDecideButton = true)
     {
         foreach(var btn in gameHiddenButtons)
         {
             btn.hideButton(go);
         }
-        if (hideDecideButton)
+        //if (hideDecideButton)
+        //    btn_decide.hide();
+        //btn_confirm.hide();
+        //btn_cancel.hide();
+    }
+    public void hideDecideButton(GameObject go)
+    {
+        if (btn_decide.cookieCard == null || btn_decide.cookieCard.gameObject == null)
+            return;
+        if (go != null && go != btn_decide.cookieCard.gameObject)
             btn_decide.hide();
-        btn_confirm.hide();
-        btn_cancel.hide();
+
     }
 
+
     public void loadOldField()
     {
         //if (File.Exists("texture/duel/field.png"))
@@ -552,6 +561,9 @@ public class GameField : OCGobject
     {
         currentString = "T" + Program.I().ocgcore.turns + " " + hint;
         realize();
+
+        Program.I().hint.gameObject.SetActive(true);
+        Program.I().hint.text = hint;
     }
 
     public void setHintLogical(string hint)

Assets/SibylSystem/Program.cs

@@ -30,7 +30,7 @@ public class Program : MonoBehaviour
     public GameObject new_ui_cardDescription;
     public GameObject new_ui_search;
     public CardListHandler new_ui_cardList;
-    public CardSelectionHandler new_ui_cardSelection;
+    public CardSelectionHandler cardSelection;
     public gameInfo new_ui_gameInfo;
 
     [Header("ui_windows_2d")] 
@@ -50,6 +50,7 @@ public class Program : MonoBehaviour
     public GameObject new_ui_book;
     public CharacterSelect character;
     public Appearance appearance;
+    public UILabel hint;
 
     [Header("其他")] 
     public GameObject mouseParticle;
@@ -142,9 +143,12 @@ public class Program : MonoBehaviour
     public GameObject remaster_tagRoom;
     public GameObject remaster_room;
     public GameObject ES_1;
-    public GameObject ES_2;
-    public GameObject ES_2Force;
-    public GameObject ES_3cancle;
+    public GameObject ES_2_left;
+    public GameObject ES_2_right;
+    public GameObject ES_2Force_left;
+    public GameObject ES_2Force_right;
+    public GameObject ES_3cancle_left;
+    public GameObject ES_3cancle_right;
     public GameObject ES_Single_multiple_window;
     public GameObject ES_Single_option;
     public GameObject ES_multiple_option;
@@ -153,7 +157,8 @@ public class Program : MonoBehaviour
     public GameObject ES_position3;
     public GameObject ES_Tp;
     public GameObject ES_Face;
-    public GameObject ES_FS;
+    public GameObject ES_FS_left;
+    public GameObject ES_FS_right;
     public GameObject Pro1_CardShower;
     public GameObject Pro1_superCardShower;
     public GameObject Pro1_superCardShowerA;
@@ -582,7 +587,7 @@ public class Program : MonoBehaviour
 
     public void fixALLcamerasPreFrame()//mark 摄像机位置调整
     {
-        if (Shortcuts.lockCamera) cameraPosition = new Vector3(0, 95, -37);
+        //if (Shortcuts.lockCamera) cameraPosition = new Vector3(0, 95, -37);
         deltaTime = Time.deltaTime;
         if (deltaTime > 1f / targetFrame) deltaTime = 1f / targetFrame;
         if (main_camera != null)

Assets/SibylSystem/ResourceManagers/GameTextureManager.cs

@@ -79,9 +79,9 @@ public class GameTextureManager
     private static readonly Dictionary<int, Task<Texture2D>> loadedCloseUp = new Dictionary<int, Task<Texture2D>>();
     private static readonly Dictionary<string, Texture2D> loadedUI = new Dictionary<string, Texture2D>();
 
-    public static Task<Texture2D> GetCardPicture(int code)
+    public static Task<Texture2D> GetCardPicture(int code, int player =0)
     {
-        return GetCardPicture(code, myBack);
+        return GetCardPicture(code, player == 0 ? myBack : opBack);
     }
 
     public static async Task<Texture2D> GetCardPicture(int code, Texture2D zero)

Assets/SibylSystem/Room/AIRoom.cs

-using System;
+using Percy;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
@@ -10,6 +11,8 @@ public class AIRoom : WindowServantSP
     #region ui
     UIselectableList superScrollView = null;
     GameObject aideck_;
+    UITexture cardShower;
+    Texture def;
     string sort = "sortByTimeDeck";
     System.Diagnostics.Process serverProcess;
     System.Diagnostics.Process botProcess;
@@ -20,6 +23,7 @@ public class AIRoom : WindowServantSP
         public string command;
         public string desc;
         public string[] flags;
+        public int main0;
     }
     private IList<BotInfo> Bots = new List<BotInfo>();
     private void ReadBots(string confPath)
@@ -34,10 +38,22 @@ public class AIRoom : WindowServantSP
                 newBot.name = line.TrimStart('!');
                 newBot.command = reader.ReadLine().Trim();
                 newBot.desc = reader.ReadLine().Trim();
+
                 line = reader.ReadLine().Trim();
                 newBot.flags = line.Split(' ');
-                //if (Array.IndexOf(newBot.flags, "SELECT_DECKFILE") < 0)
-                    Bots.Add(newBot);
+
+                newBot.main0 = 5990062;
+                YGOSharp.Deck aiDeck = new YGOSharp.Deck();
+                try
+                {
+                    string deckName = "";
+                    deckName = newBot.command.Split(new string[] { "Deck=", " Dialog=" }, StringSplitOptions.RemoveEmptyEntries)[1].Replace("'", "").Replace(" ", "");
+                    DeckManager.FromYDKtoCodedDeck("WindBot/Decks/Ai_" + deckName + ".ydk", out aiDeck);
+                    newBot.main0 = aiDeck.Main[0];
+                }
+                catch (Exception e) { }
+
+                Bots.Add(newBot);
             }
         }
     }
@@ -58,6 +74,12 @@ public class AIRoom : WindowServantSP
         return "";
     }
 
+    public override void hide()
+    {
+        base.hide();
+        SEHandler.PlayInternalAudio("se_sys/SE_MENU_SLIDE_04");
+    }
+
     public override void initialize()
     {
         CreateWindow(Program.I().new_ui_aiRoom);
@@ -71,6 +93,8 @@ public class AIRoom : WindowServantSP
         ReadBots("config/bot.conf");
         aideck_ = GameObject.Find("aideck_");
         aideck_.SetActive(false);
+        cardShower = UIHelper.getByName<UITexture>(gameObject, "card_shower");
+        def = cardShower.mainTexture;
         foreach (var deck in UIHelper.GetDecks())
         {
             aideck_.GetComponent<UIPopupList>().AddItem(deck);
@@ -88,9 +112,15 @@ public class AIRoom : WindowServantSP
                 aideck_.SetActive(true);
             else
                 aideck_.SetActive(false);
+            if (Bots[sel].main0 == 5990062)
+                cardShower.mainTexture = def;
+            else
+                cardShower.mainTexture = GameTextureManager.GetCardPictureNow(Bots[sel].main0);
         }
         else
+        {
             UIHelper.trySetLableText(gameObject, "botdesc_", InterString.Get("请选择对手。"));
+        }
     }
 
     void onSave()
@@ -105,7 +135,10 @@ public class AIRoom : WindowServantSP
         if (Program.exitOnReturn)
             Program.I().menu.onClickExit();
         else
+        {
             Program.I().shiftToServant(Program.I().menu);
+            UIHandler.OpenHomeUI();
+        }
     }
 
     public void killServerProcess()
@@ -159,6 +192,7 @@ public class AIRoom : WindowServantSP
         printFile();
         onSelected();
         Program.charge();
+        SEHandler.PlayInternalAudio("se_sys/SE_MENU_SLIDE_03");
     }
 
     #endregion

Assets/SibylSystem/Servant.cs

@@ -468,14 +468,10 @@ public class Servant
         RMSshow_clear();
         currentMShash = hashCode;
         currentMStype = messageSystemType.yesOrNo;
-        currentMSwindow = create
-        (
-            Program.I().ES_2,
-            MSentre(),
-            Vector3.zero,
-            true,
-            Program.I().ui_main_2d
-        );
+        if (Program.I().setting.setting.confirmLeft.value)
+            currentMSwindow = create(Program.I().ES_2_left, MSentre(), Vector3.zero, true, Program.I().ui_main_2d);
+        else
+            currentMSwindow = create(Program.I().ES_2_right, MSentre(), Vector3.zero, true, Program.I().ui_main_2d);
         UIHelper.InterGameObject(currentMSwindow);
         UIHelper.trySetLableText(currentMSwindow, "hint_", hint);
         UIHelper.registEvent(currentMSwindow, "yes_", ES_RMSpremono, yes);
@@ -487,14 +483,10 @@ public class Servant
     public void RMSshow_yesOrNoForce(string hint, messageSystemValue yes, messageSystemValue no)
     {
         RMSshow_clearYNF();
-        yesOrNoForce = create
-        (
-            Program.I().ES_2Force,
-            MSentre(),
-            Vector3.zero,
-            true,
-            Program.I().ui_main_2d
-        );
+        if (Program.I().setting.setting.confirmLeft.value)
+            yesOrNoForce = create(Program.I().ES_2Force_left, MSentre(), Vector3.zero, true, Program.I().ui_main_2d);
+        else
+            yesOrNoForce = create(Program.I().ES_2Force_right, MSentre(), Vector3.zero, true, Program.I().ui_main_2d);
         UIHelper.InterGameObject(yesOrNoForce);
         UIHelper.trySetLableText(yesOrNoForce, "hint_", hint);
         UIHelper.registEvent(yesOrNoForce, "yes_", ES_RMSpremonoForceYesNo, yes);
@@ -516,14 +508,10 @@ public class Servant
         RMSshow_clear();
         currentMShash = hashCode;
         currentMStype = messageSystemType.yesOrNo;
-        currentMSwindow = create
-        (
-            Program.I().ES_FS,
-            MSentre(),
-            Vector3.zero,
-            true,
-            Program.I().ui_main_2d
-        );
+        if (Program.I().setting.setting.confirmLeft.value)
+            currentMSwindow = create(Program.I().ES_FS_left, MSentre(), Vector3.zero, true, Program.I().ui_main_2d);
+        else
+            currentMSwindow = create(Program.I().ES_FS_right, MSentre(), Vector3.zero, true, Program.I().ui_main_2d);
         UIHelper.InterGameObject(currentMSwindow);
         UIHelper.registEvent(currentMSwindow, "yes_", ES_RMSpremono, first);
         UIHelper.registEvent(currentMSwindow, "no_", ES_RMSpremono, second);
@@ -535,14 +523,10 @@ public class Servant
         RMSshow_clear();
         currentMShash = hashCode;
         currentMStype = messageSystemType.yesOrNoOrCancle;
-        currentMSwindow = create
-        (
-            Program.I().ES_3cancle,
-            MSentre(),
-            Vector3.zero,
-            true,
-            Program.I().ui_main_2d
-        );
+        if (Program.I().setting.setting.confirmLeft.value)
+            currentMSwindow = create(Program.I().ES_3cancle_left, MSentre(), Vector3.zero, true, Program.I().ui_main_2d);
+        else
+            currentMSwindow = create(Program.I().ES_3cancle_right, MSentre(), Vector3.zero, true, Program.I().ui_main_2d);
         UIHelper.InterGameObject(currentMSwindow);
         UIHelper.trySetLableText(currentMSwindow, "hint_", hint);
         UIHelper.registEvent(currentMSwindow, "yes_", ES_RMSpremono, yes);

Assets/SibylSystem/ServantWithCardDescription.cs

@@ -13,7 +13,7 @@ public class ServantWithCardDescription : Servant
         Program.reMoveCam(Screen.width / 2);
         Program.I().cardDescription.hide();
         Program.I().new_ui_cardList.hide();
-        Program.I().new_ui_cardSelection.hide();
+        Program.I().cardSelection.hide();
         base.hide();
     }
 

Assets/SibylSystem/Setting/Setting.cs

@@ -37,6 +37,7 @@ public class Setting : WindowServant2D
         UIHelper.getByName<UIToggle>(gameObject, "handmPosition_").value =
             UIHelper.fromStringToBool(Config.Get("handmPosition_", "1"));
         UIHelper.getByName<UIToggle>(gameObject, "spyer_").value = UIHelper.fromStringToBool(Config.Get("spyer_", "0"));
+        UIHelper.getByName<UIToggle>(gameObject, "confirmLeft_").value = UIHelper.fromStringToBool(Config.Get("confirmLeft_", "0"));
         UIHelper.getByName<UIToggle>(gameObject, "resize_").canChange = false;
         if (QualitySettings.GetQualityLevel() < 3)
             UIHelper.getByName<UIToggle>(gameObject, "high_").value = false;
@@ -49,6 +50,7 @@ public class Setting : WindowServant2D
         UIHelper.registEvent(gameObject, "handPosition_", save);
         UIHelper.registEvent(gameObject, "handmPosition_", save);
         UIHelper.registEvent(gameObject, "spyer_", save);
+        UIHelper.registEvent(gameObject, "confirmLeft_", save);
         UIHelper.registEvent(gameObject, "high_", save);
 
         //Program.go(2000, readVales);
@@ -121,10 +123,12 @@ public class Setting : WindowServant2D
 
     void SelectCharacter1()
     {
+        Program.I().character.gameObject.SetActive(true);
         Program.I().character.Show(0);
     }
     void SelectCharacter2()
     {
+        Program.I().character.gameObject.SetActive(true);
         Program.I().character.Show(1);
     }
 
@@ -283,7 +287,7 @@ public class Setting : WindowServant2D
         Config.Set("handmPosition_",
             UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "handmPosition_").value));
         Config.Set("spyer_", UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "spyer_").value));
-       
+        Config.Set("confirmLeft_", UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "confirmLeft_").value));
         if (UIHelper.getByName<UIToggle>(gameObject, "high_").value)
             QualitySettings.SetQualityLevel(5);
         else

Assets/SibylSystem/WindowServantSP.cs

@@ -31,7 +31,6 @@ public class WindowServantSP : Servant
             Program.go(1000, SetActiveFalse);
             if (glass != null) glass.gameObject.SetActive(false);
         }
-
         // resize();
     }
 
@@ -58,7 +57,6 @@ public class WindowServantSP : Servant
             var glass = gameObject.transform.Find("glass");
             if (glass != null) glass.gameObject.SetActive(true);
         }
-
         // resize();
     }
 

Assets/YGOSharp/CardsManager.cs

@@ -21,11 +21,8 @@ namespace YGOSharp
             nullName = InterString.Get("欢迎使用MDPro2");
             nullString = @"
 快捷键功能：
-F2：开关设置；
 F4：开关卡片描述；
 F5：开关决斗时的UI；
-F6：锁定画面位置(画面无法上下移动)；
-F7：切换确认卡片的位置。
 
 玩家交流群：
 814558068"

Assets/old/loader.prefab

@@ -77,6 +77,9 @@ MonoBehaviour:
   new_bar_room: {fileID: 0}
   new_ui_searchDetailed: {fileID: 0}
   new_ui_book: {fileID: 0}
+  character: {fileID: 0}
+  appearance: {fileID: 0}
+  hint: {fileID: 0}
   mouseParticle: {fileID: 0}
   face: {fileID: 11468716, guid: faf0ce5c46e971049a20f2597b5f6194, type: 3}
   zhankai: {fileID: 8300000, guid: cab912f3009b43843b0a48ac3120c6ad, type: 3}
@@ -216,9 +219,12 @@ MonoBehaviour:
   remaster_tagRoom: {fileID: 154246, guid: 95580b5915bf1eb4eaf9b6b19a82f92d, type: 3}
   remaster_room: {fileID: 154246, guid: 1718089c19d00d94a81b6b4ff32ff574, type: 3}
   ES_1: {fileID: 152348, guid: 49504cab875642a4a89768cf637df4e0, type: 3}
-  ES_2: {fileID: 125396, guid: c5cf793ce3857464eafa8aa15c1cfc06, type: 3}
-  ES_2Force: {fileID: 125396, guid: f687813851d9d9548b710c198d84db01, type: 3}
-  ES_3cancle: {fileID: 136638, guid: b40821dc1a2e1374981ee75e4c966c3f, type: 3}
+  ES_2_left: {fileID: 125396, guid: f4a725428b625f5459f4bcab2cbe0394, type: 3}
+  ES_2_right: {fileID: 125396, guid: c5cf793ce3857464eafa8aa15c1cfc06, type: 3}
+  ES_2Force_left: {fileID: 125396, guid: 11f76f7f188cfe943ab448d6c0563c10, type: 3}
+  ES_2Force_right: {fileID: 125396, guid: f687813851d9d9548b710c198d84db01, type: 3}
+  ES_3cancle_left: {fileID: 136638, guid: b40821dc1a2e1374981ee75e4c966c3f, type: 3}
+  ES_3cancle_right: {fileID: 136638, guid: dd732b939c6695a4c948d9f2bfc8d9f7, type: 3}
   ES_Single_multiple_window: {fileID: 124974, guid: 973d36324e25edb4e937f0d46b67d978,
     type: 3}
   ES_Single_option: {fileID: 140558, guid: c67c5053dc1b3c14db4efc960bc8f57c, type: 3}
@@ -228,7 +234,8 @@ MonoBehaviour:
   ES_position3: {fileID: 197414, guid: fcbf44955a2f3ab4cbe011937cb34887, type: 3}
   ES_Tp: {fileID: 139314, guid: 3cafe5fcc84bd994cb64aaf0fc2b4ec6, type: 3}
   ES_Face: {fileID: 195852, guid: b8748dafca1e28c4d9e882fb8b3ff68b, type: 3}
-  ES_FS: {fileID: 150976, guid: e371745b12d178b4ebe42e879820c9bb, type: 3}
+  ES_FS_left: {fileID: 150976, guid: 25df3b2c0cf488d4183459a571b44898, type: 3}
+  ES_FS_right: {fileID: 150976, guid: e371745b12d178b4ebe42e879820c9bb, type: 3}
   Pro1_CardShower: {fileID: 166874, guid: 7b9a1520ac854164d80116f4c9cd49f4, type: 3}
   Pro1_superCardShower: {fileID: 166874, guid: 9c687fe8a2487c34a857f20d148bce8e, type: 3}
   Pro1_superCardShowerA: {fileID: 166874, guid: ed7ee42be6f2d9742ab3af7f921085ad,

Assets/transUI/prefab/trans_ES2_left.prefab.meta

+fileFormatVersion: 2
+guid: f4a725428b625f5459f4bcab2cbe0394
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/transUI/prefab/trans_ES2.prefab → Assets/transUI/prefab/trans_ES2_right.prefab

@@ -341,7 +341,7 @@ GameObject:
   - component: {fileID: 400996}
   - component: {fileID: 11409818}
   m_Layer: 5
-  m_Name: trans_ES2
+  m_Name: trans_ES2_right
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/transUI/prefab/trans_ES2f_left.prefab.meta

+fileFormatVersion: 2
+guid: 11f76f7f188cfe943ab448d6c0563c10
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/transUI/prefab/trans_ES2f.prefab → Assets/transUI/prefab/trans_ES2f_right.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 400996}
   - component: {fileID: 11409818}
   m_Layer: 5
-  m_Name: trans_ES2f
+  m_Name: trans_ES2f_right
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/transUI/prefab/trans_ES3.prefab → Assets/transUI/prefab/trans_ES3_right.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 416440}
   - component: {fileID: 11405706}
   m_Layer: 5
-  m_Name: trans_ES3
+  m_Name: trans_ES3_right
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/transUI/prefab/trans_ES3_right.prefab.meta

+fileFormatVersion: 2
+guid: dd732b939c6695a4c948d9f2bfc8d9f7
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/transUI/prefab/trans_ES_fs.prefab → Assets/transUI/prefab/trans_ES_fs_left.prefab

@@ -759,7 +759,7 @@ GameObject:
   - component: {fileID: 459578}
   - component: {fileID: 11474506}
   m_Layer: 5
-  m_Name: trans_ES_fs
+  m_Name: trans_ES_fs_left
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -947,7 +947,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 440
+  aspectRatio: 3.5772357
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -1043,7 +1043,7 @@ MonoBehaviour:
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 12800000, guid: 154a5b3c6e48fa4448be221e7c4a68de, type: 3}
   mFont: {fileID: 0}
-  mText: "\u540E\u653B"
+  mText: "\u5148\u653B"
   mFontSize: 20
   mFontStyle: 0
   mAlignment: 0
@@ -1141,7 +1141,7 @@ MonoBehaviour:
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 12800000, guid: 154a5b3c6e48fa4448be221e7c4a68de, type: 3}
   mFont: {fileID: 0}
-  mText: "\u5148\u653B"
+  mText: "\u540E\u653B"
   mFontSize: 20
   mFontStyle: 0
   mAlignment: 0
@@ -1413,7 +1413,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3001
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 0
@@ -1708,7 +1708,7 @@ GameObject:
   - component: {fileID: 4855759391788608875}
   - component: {fileID: 7833900345855951553}
   m_Layer: 5
-  m_Name: no_
+  m_Name: yes_
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1837,8 +1837,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7d44bc69c2ca5f943b845318866dc1bd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  audioClip: {fileID: 8300000, guid: 955d6cf27c5e0c54b87f317812dc96ea, type: 3}
+  audioClip: {fileID: 8300000, guid: ae3d99ac8f0551f47a359c3411a82339, type: 3}
   trigger: 0
+  type: 0
   volume: 1
   pitch: 1
 --- !u!1 &6778328633072805145
@@ -1855,7 +1856,7 @@ GameObject:
   - component: {fileID: 6014777553183555787}
   - component: {fileID: 7878113315921354498}
   m_Layer: 5
-  m_Name: yes_
+  m_Name: no_
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1986,6 +1987,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   audioClip: {fileID: 8300000, guid: ae3d99ac8f0551f47a359c3411a82339, type: 3}
   trigger: 0
+  type: 0
   volume: 1
   pitch: 1
 --- !u!1 &6820640984989702420

Assets/transUI/prefab/trans_ES_fs_left.prefab.meta

+fileFormatVersion: 2
+guid: 25df3b2c0cf488d4183459a571b44898
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/transUI/prefab/trans_ES_input.prefab

@@ -1166,13 +1166,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 3
-  mWidth: 126
+  mWidth: 128
   mHeight: 26
   mDepth: 10
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 4.8461537
+  aspectRatio: 4.923077
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 12800000, guid: 154a5b3c6e48fa4448be221e7c4a68de, type: 3}
   mFont: {fileID: 0}
@@ -1377,7 +1377,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2505164805731337289}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 14, y: 0, z: 0}
+  m_LocalPosition: {x: 15, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 8909130062664952683}
@@ -1426,7 +1426,7 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 606, y: 54, z: 0}
+  m_Size: {x: 604, y: 54, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &422499989638386834
 MonoBehaviour:
@@ -1459,13 +1459,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 606
+  mWidth: 604
   mHeight: 54
   mDepth: 9
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 11.388889
+  aspectRatio: 11.185185
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -1594,7 +1594,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3487874264043643826}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -298, y: 15, z: 0}
+  m_LocalPosition: {x: -292, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5119736548784969455}
@@ -1615,29 +1615,29 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 5119736548784969455}
     relative: 0
-    absolute: 5
+    absolute: 10
   rightAnchor:
     target: {fileID: 5119736548784969455}
     relative: 1
-    absolute: -5
+    absolute: -10
   bottomAnchor:
     target: {fileID: 5119736548784969455}
     relative: 0
-    absolute: 0
+    absolute: 5
   topAnchor:
     target: {fileID: 5119736548784969455}
     relative: 1
-    absolute: -12
+    absolute: -5
   updateAnchors: 1
-  mColor: {r: 1, g: 1, b: 1, a: 0.40392157}
-  mPivot: 0
-  mWidth: 596
-  mHeight: 42
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 3
+  mWidth: 584
+  mHeight: 44
   mDepth: 21
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 14.547619
+  aspectRatio: 13.272727
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 12800000, guid: 154a5b3c6e48fa4448be221e7c4a68de, type: 3}
   mFont: {fileID: 0}
@@ -1653,7 +1653,7 @@ MonoBehaviour:
   mEffectDistance: {x: 1, y: 1}
   mOverflow: 1
   mMaterial: {fileID: 0}
-  mApplyGradient: 1
+  mApplyGradient: 0
   mGradientTop: {r: 1, g: 1, b: 1, a: 1}
   mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
   mSpacingX: 0