new diy spine and update Unity to 2020.3.46f1

Assets/MD/DuelLinks/CharacterSelect.cs

@@ -56,6 +56,8 @@ public class CharacterSelect : MonoBehaviour
 
         if (Program.I().ocgcore.gameField != null && Program.I().ocgcore.gameField.gameObject != null)
             base_.alpha = 0.95f;
+        else if (Program.I().deckManager.isShowed)
+            base_.alpha = 0.95f;
         else
             base_.alpha = 0f;
 
@@ -85,10 +87,12 @@ public class CharacterSelect : MonoBehaviour
             UIHandler.OpenHomeUI(false);
         else
         {
-            Program.I().menu.show();
-            UIHandler.OpenHomeUI();
+            if(!Program.I().deckManager.isShowed)
+            {
+                Program.I().menu.show();
+                UIHandler.OpenHomeUI();
+            }
         }
-            
 
         DOTween.To(() => panel.alpha, x => panel.alpha = x, 0f, 0.2f);
         SEHandler.PlayInternalAudio("se_sys/SE_MENU_SLIDE_04");

Assets/MD/Scripts/AttributeIcons.cs

@@ -15,47 +15,42 @@ public class AttributeIcons : MonoBehaviour
     public Sprite spell_;
     public Sprite trap_;
 
-    UI2DSprite sprite;
-    private void Start()
-    {
-        sprite = GetComponent<UI2DSprite>();
-    }
     public void ChangeAttribute(string att)
     {
         switch (att)
         {
             case "无":
-                sprite.sprite2D = null_; 
+                GetComponent<UI2DSprite>().sprite2D = null_; 
                 break;
             case "光":
-                sprite.sprite2D = light_;
+                GetComponent<UI2DSprite>().sprite2D = light_;
                 break;
             case "暗":
-                sprite.sprite2D = dark_;
+                GetComponent<UI2DSprite>().sprite2D = dark_;
                 break;
             case "水":
-                sprite.sprite2D = water_;
+                GetComponent<UI2DSprite>().sprite2D = water_;
                 break;
             case "炎":
-                sprite.sprite2D = fire_;
+                GetComponent<UI2DSprite>().sprite2D = fire_;
                 break;
             case "地":
-                sprite.sprite2D = earth_;
+                GetComponent<UI2DSprite>().sprite2D = earth_;
                 break;
             case "风":
-                sprite.sprite2D = wind_;
+                GetComponent<UI2DSprite>().sprite2D = wind_;
                 break;
             case "神":
-                sprite.sprite2D = divine_;
+                GetComponent<UI2DSprite>().sprite2D = divine_;
                 break;
             case "魔法":
-                sprite.sprite2D = spell_;
+                GetComponent<UI2DSprite>().sprite2D = spell_;
                 break;
             case "陷阱":
-                sprite.sprite2D = trap_;
+                GetComponent<UI2DSprite>().sprite2D = trap_;
                 break;
             default: 
-                sprite.sprite2D = null_;
+                GetComponent<UI2DSprite>().sprite2D = null_;
                 break;
         }
     }

Assets/MD/Scripts/BGMHandler.cs

@@ -15,7 +15,7 @@ public class BGMHandler : MonoBehaviour
 
     public static int card;
     public static bool cardBGM;
-    private void Start()
+    private void Awake()
     {
         audioSource = GetComponent<AudioSource>();
         vol = int.Parse(Config.Get("bgmVol_", "500")) / 1000f;

Assets/MD/Scripts/LimitIcons.cs

@@ -10,27 +10,21 @@ public class LimitIcons : MonoBehaviour
     public Sprite limit1;
     public Sprite limit2;
 
-    UI2DSprite sprite;
-
-    private void Start()
-    {
-        sprite = GetComponent<UI2DSprite>();
-    }
     public void ChangeIcon(int i)
     {
         switch (i)
         {
             case 0:
-                sprite.sprite2D = ban;
+                GetComponent<UI2DSprite>().sprite2D = ban;
                 break;
             case 1:
-                sprite.sprite2D = limit1;
+                GetComponent<UI2DSprite>().sprite2D = limit1;
                 break;
             case 2:
-                sprite.sprite2D = limit2;
+                GetComponent<UI2DSprite>().sprite2D = limit2;
                 break;
             case 3:
-                sprite.sprite2D = null_;
+                GetComponent<UI2DSprite>().sprite2D = null_;
                 break;
         }
     }

Assets/MD/Scripts/UIHandler.cs

@@ -101,12 +101,16 @@ public class UIHandler : MonoBehaviour
     }
     public static void CloseHomeUI()
     {
+        if (homeUI == null)
+            return;
         homeUI.SetActive(false);
     }
 
     public static void OpenHomeUI(bool now = true)
     {
-        if(now)
+        if (homeUI == null)
+            return;
+        if (now)
         {
             homeUI.SetActive(true);
             LoadBgFront(Config.Get("Wallpaper0", "随机"));

Assets/MD/Spine/DDD 双晓王 末法神/15939229.prefab.meta

@@ -3,5 +3,5 @@ guid: 3727f53d895f7504c996ac7a740c721b
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 15939229
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/DIY 帝姬.meta

+fileFormatVersion: 2
+guid: 0bac99906bd6c144a9487ff77d804b3d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Spine/DIY 帝姬/44100468.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6437757509327315823
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6437757509327315811}
+  - component: {fileID: 6437757509327315808}
+  - component: {fileID: 6437757509327315809}
+  - component: {fileID: 6437757509327315822}
+  m_Layer: 7
+  m_Name: 44100468
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6437757509327315811
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6437757509327315823}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.3, y: -0.22, z: 0}
+  m_LocalScale: {x: 0.2, y: 0.2, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &6437757509327315808
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6437757509327315823}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 2f611560286ea824f95fff50a040bb43, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!114 &6437757509327315809
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6437757509327315823}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: 3c0f640ca786cfb47926b4428c405836, type: 2}
+  initialSkinName: 
+  fixPrefabOverrideViaMeshFilter: 2
+  initialFlipX: 0
+  initialFlipY: 0
+  updateWhenInvisible: 3
+  separatorSlotNames: []
+  zSpacing: 0
+  useClipping: 1
+  immutableTriangles: 0
+  pmaVertexColors: 1
+  clearStateOnDisable: 0
+  tintBlack: 0
+  singleSubmesh: 0
+  fixDrawOrder: 0
+  addNormals: 0
+  calculateTangents: 0
+  maskInteraction: 0
+  maskMaterials:
+    materialsMaskDisabled: []
+    materialsInsideMask: []
+    materialsOutsideMask: []
+  disableRenderingOnOverride: 1
+  updateTiming: 1
+  unscaledTime: 0
+  _animationName: animation
+  loop: 0
+  timeScale: 1
+--- !u!33 &6437757509327315822
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6437757509327315823}
+  m_Mesh: {fileID: 0}

Assets/MD/Spine/DIY 帝姬/44100468.prefab.meta

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

Assets/MD/Spine/DIY 帝姬/帝姬.atlas.txt

+帝姬.png
+size:3100,772
+filter:Linear,Linear
+pma:true
+Eye-L
+bounds:726,71,37,35
+offsets:0,1,37,36
+rotate:90
+Eye-R
+bounds:2137,310,47,32
+offsets:0,3,48,35
+rotate:90
+Face
+bounds:1557,7,187,205
+rotate:90
+Hair-B-02
+bounds:1158,190,86,181
+rotate:90
+Hair-B-03
+bounds:2470,313,132,112
+rotate:90
+Hair-F-01
+bounds:1378,2,191,177
+rotate:90
+Hair-L-01-中
+bounds:2612,10,42,115
+rotate:90
+Hair-L-01下
+bounds:1082,60,15,48
+Hair-L-02-上
+bounds:682,69,42,39
+Hair-L-02-下
+bounds:2584,317,89,128
+Hair-L-03
+bounds:2198,359,79,160
+rotate:90
+Hair-LB-01
+bounds:1542,196,80,137
+offsets:2,2,84,140
+rotate:90
+Hair-LF-01
+bounds:268,10,55,196
+rotate:90
+Hair-LF-02
+bounds:2775,328,159,183
+Hair-RB-01
+bounds:2983,4,113,145
+Hair-RF-01-上0
+bounds:2675,324,98,187
+Hair-RF-01-上1
+bounds:802,5,103,165
+offsets:0,1,103,166
+rotate:90
+Hair-RF-01-下
+bounds:2935,151,126,175
+Hair-RF-01-下1
+bounds:1341,195,81,167
+rotate:90
+Hair-RF-01-中
+bounds:2824,147,109,179
+发箍
+bounds:2824,18,157,127
+offsets:1,1,160,129
+发箍上层
+bounds:1015,110,84,77
+offsets:2,1,87,79
+右下眼影
+bounds:2103,305,52,32
+rotate:90
+右发饰
+bounds:2659,513,199,257
+offsets:1,1,201,259
+右大腿护甲
+bounds:2439,447,218,323
+offsets:1,1,220,325
+右小腿护甲
+bounds:1158,278,492,483
+rotate:90
+右手红
+bounds:1643,292,478,458
+rotate:90
+右眼睫毛
+bounds:2375,340,71,22
+右翼上红
+bounds:1780,6,284,340
+offsets:1,3,286,344
+rotate:90
+右翼白上
+bounds:682,110,660,331
+offsets:1,1,663,334
+rotate:90
+右翼白下
+bounds:2103,359,411,93
+offsets:2,1,414,95
+rotate:90
+右翼白中
+bounds:1015,189,581,141
+offsets:1,1,583,144
+rotate:90
+右肩甲上
+bounds:2,2,79,63
+offsets:1,1,81,65
+右肩甲下
+bounds:1681,196,94,97
+offsets:1,1,96,99
+rotate:90
+右肩膀补充
+bounds:703,3,97,64
+offsets:2,2,101,67
+图层 1 副本 2
+bounds:2,67,703,678
+offsets:2,2,706,681
+rotate:90
+图层 3
+bounds:1510,195,30,81
+图层 4
+bounds:2204,313,44,169
+rotate:90
+头部背影
+bounds:2612,54,261,210
+offsets:1,1,263,212
+rotate:90
+头顶
+bounds:1082,45,14,13
+offsets:1,1,16,15
+左下眼影
+bounds:763,73,35,35
+左发饰白
+bounds:83,5,60,183
+offsets:1,1,62,185
+rotate:90
+左发饰红
+bounds:466,12,53,200
+offsets:1,1,55,202
+rotate:90
+左大腿
+bounds:2198,440,239,330
+offsets:2,2,243,333
+左小腿
+bounds:2860,516,254,220
+offsets:1,1,256,222
+rotate:90
+左手
+bounds:1101,4,275,183
+左眼皮
+bounds:2171,311,46,31
+offsets:1,1,48,33
+rotate:90
+左眼睫毛
+bounds:668,13,52,33
+offsets:0,0,52,34
+rotate:90
+左肩
+bounds:2936,351,97,163
+offsets:1,1,99,165
+眼睫毛
+bounds:466,3,13,7
+offsets:1,1,15,9
+肺部
+bounds:2360,364,74,108
+offsets:1,1,76,110
+rotate:90
+胸部
+bounds:2122,4,229,299
+裙甲
+bounds:969,8,111,100
+offsets:1,1,113,102
+躯干
+bounds:2353,4,307,257
+rotate:90

Assets/MD/Spine/DIY 帝姬/帝姬.atlas.txt.meta

+fileFormatVersion: 2
+guid: 0973b7b589411fa4c9e618f2efea2b62
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Spine/DIY 帝姬/帝姬.json.meta

+fileFormatVersion: 2
+guid: 9b812c3922f295d4c829c979c406cead
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Spine/DIY 帝姬/帝姬.png.meta

+fileFormatVersion: 2
+guid: d4d73c41e35a8f2449ef891c83a6644e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 0
+    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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  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/Spine/DIY 帝姬/帝姬_Atlas.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: a6b194f808b1af6499c93410e504af42, type: 3}
+  m_Name: "\u5E1D\u59EC_Atlas"
+  m_EditorClassIdentifier: 
+  atlasFile: {fileID: 4900000, guid: 0973b7b589411fa4c9e618f2efea2b62, type: 3}
+  materials:
+  - {fileID: 2100000, guid: 2f611560286ea824f95fff50a040bb43, type: 2}

Assets/MD/Spine/DIY 帝姬/帝姬_Atlas.asset.meta

+fileFormatVersion: 2
+guid: edc25435c222aa04eb75ea1b402d979e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Spine/DIY 帝姬/帝姬_Material.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: "\u5E1D\u59EC_Material"
+  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
+  m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: d4d73c41e35a8f2449ef891c83a6644e, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _Cutoff: 0.1
+    - _OutlineMipLevel: 0
+    - _OutlineOpaqueAlpha: 1
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
+    - _StencilComp: 8
+    - _StencilRef: 1
+    - _StraightAlphaInput: 0
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
+    m_Colors:
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
+  m_BuildTextureStacks: []

Assets/MD/Spine/DIY 帝姬/帝姬_Material.mat.meta

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

Assets/MD/Spine/DIY 帝姬/帝姬_SkeletonData.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
+  m_Name: "\u5E1D\u59EC_SkeletonData"
+  m_EditorClassIdentifier: 
+  atlasAssets:
+  - {fileID: 11400000, guid: edc25435c222aa04eb75ea1b402d979e, type: 2}
+  scale: 0.01
+  skeletonJSON: {fileID: 4900000, guid: 9b812c3922f295d4c829c979c406cead, type: 3}
+  isUpgradingBlendModeMaterials: 0
+  blendModeMaterials:
+    requiresBlendModeMaterials: 0
+    applyAdditiveMaterial: 0
+    additiveMaterials: []
+    multiplyMaterials: []
+    screenMaterials: []
+  skeletonDataModifiers: []
+  fromAnimation: []
+  toAnimation: []
+  duration: []
+  defaultMix: 0.2
+  controller: {fileID: 0}

Assets/MD/Spine/DIY 帝姬/帝姬_SkeletonData.asset.meta

+fileFormatVersion: 2
+guid: 3c0f640ca786cfb47926b4428c405836
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Spine/GO-DDD 神零王 零神·零儿/40227329.prefab.meta

@@ -3,5 +3,5 @@ guid: 895a2a0f59e94274d8db5f44c1f7615e
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 40227329
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/假面英雄 光牙/50608164.prefab.meta

@@ -3,5 +3,5 @@ guid: 96445fd7f65ae304089ea99516743684
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 50608164
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/假面英雄 宝钻/62624486.prefab.meta

@@ -3,5 +3,5 @@ guid: 037eb26ae7ff26349804ede79011f328
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 62624486
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/假面英雄 暗鬼/59642500.prefab.meta

@@ -3,5 +3,5 @@ guid: a421471b9d40b3d468867674dcb94cb3
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 59642500
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/假面英雄 阵风/89870349.prefab.meta

@@ -3,5 +3,5 @@ guid: 32906e2bb62ce1948b4a72129e1f199d
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 89870349
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/元素英雄 大地侠/16304628.prefab.meta

@@ -3,5 +3,5 @@ guid: eee714020ff39c144a39833a86ff67f5
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 16304628
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/元素英雄 大龙卷侠/3642509.prefab.meta

@@ -3,5 +3,5 @@ guid: c92630951e2bed6409b7d8d8596ba755
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 3642509
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/元素英雄 幽冥女郎/33574806.prefab.meta

@@ -3,5 +3,5 @@ guid: 17902fc96fe0efc49b1d8e049ed9af51
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 33574806
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/元素英雄 新宇侠 异画/89943724.prefab.meta

@@ -3,5 +3,5 @@ guid: ee835d24e1cf1dc43ae40fc8e5dc8826
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 89943724
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/元素英雄 新星主/1945387.prefab.meta

@@ -3,5 +3,5 @@ guid: e17df37c89321c6419e6fe0dab679e75
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 1945387
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/元素英雄 日出侠/22908820.prefab.meta

@@ -3,5 +3,5 @@ guid: 7596d2e08188aa24ab9248060263851a
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 22908820
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/元素英雄 火焰翼侠-火焰一击/93347961.prefab.meta

@@ -3,5 +3,5 @@ guid: 8b882c0d20f8fc940ac7ba0c5d8d22b9
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 93347961
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/元素英雄 真诚新宇侠/14124483.prefab.meta

@@ -3,5 +3,5 @@ guid: 7f952969a168f604d9bb6d8da73a7163
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 14124483
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/元素英雄 神·新宇侠/31111109.prefab.meta

@@ -3,5 +3,5 @@ guid: 0410fa315f2c8284294c38f9ca0960d4
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 31111109
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/元素英雄 闪光侠/22061412.prefab.meta

@@ -3,5 +3,5 @@ guid: 555e8205fcea90146a581a5fff1710aa
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 22061412
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/元素英雄 闪光火焰翼侠/25366484.prefab.meta

@@ -3,5 +3,5 @@ guid: 29d06f4af4e3dff478c220d7b18f0fc7
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 25366484
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/刚炎之剑士/98642179.prefab.meta

@@ -3,5 +3,5 @@ guid: ec577b52446d3fa448cb7aac4b666387
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 98642179
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/前托枪管龙/98630720.prefab.meta

@@ -3,5 +3,5 @@ guid: 00518c638b4bbca46b36cf358b47ac2c
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 98630720
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/动力工具龙/2403771.prefab.meta

@@ -3,5 +3,5 @@ guid: 99d301b080a3e7c4db59e7794434accc
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 2403771
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/古代妖精龙/25862681.prefab.meta

@@ -3,5 +3,5 @@ guid: 994b9602dbe88a54aa82e7f35a1e8771
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 25862681
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/命运英雄 绝命人/30757127.prefab.meta

@@ -3,5 +3,5 @@ guid: 256b02312a37db24f89d3a9b6d14e13b
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 30757127
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/命运英雄 统治人/69394324.prefab.meta

@@ -3,5 +3,5 @@ guid: 9b96b5a2612130247840cbe71b291fe6
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 69394324
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/唤醒你沉睡的元素英雄/32828466.prefab.meta

@@ -3,5 +3,5 @@ guid: 37ade26efd6af1e4987725318bb33577
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 32828466
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/宇宙耀变龙/21123811.prefab.meta

@@ -3,5 +3,5 @@ guid: fc0d0cca3f19c7f42aa4ed7dab2fd09a
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 21123811
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/对极英雄 混沌侠/23204029.prefab.meta

@@ -3,5 +3,5 @@ guid: 965ff3a127c183d46a9ed5a4db246e91
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 23204029
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/幻影英雄 三一人/46759931.prefab.meta

@@ -3,5 +3,5 @@ guid: 582be4ae9c3495d43a9a2511f513570b
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 46759931
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/武装新宇侠/31817415.prefab.meta

@@ -3,5 +3,5 @@ guid: 551ecba1261d5864bb6ba6355c46aba6
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 31817415
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/特异英雄 十字人/58004362.prefab.meta

@@ -3,5 +3,5 @@ guid: 1852e5ca435abc74aa2cdfaa2e4a2916
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 58004362
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/特异英雄 地狱裂魔/19324993.prefab.meta

@@ -3,5 +3,5 @@ guid: 093fe85ebb6022e4aaff82d9a9d7b1d4
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 19324993
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/特异英雄 神杖先驱/1948619.prefab.meta

@@ -3,5 +3,5 @@ guid: 38b72d4d32ca537449f9a785db9c31a4
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 1948619
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/生命激流龙/25165047.prefab.meta

@@ -3,5 +3,5 @@ guid: b702cfc7f14d6df42b6a72be6b2f6132
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 25165047
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/真红眼钢炎龙/44405066.prefab.meta

@@ -3,5 +3,5 @@ guid: 6d2eb7edb87f3ff428720028bc1ac4df
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 44405066
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/真红莲超新星龙/99585850.prefab.meta

@@ -3,5 +3,5 @@ guid: f882057fd25334a408feeccf58583164
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 99585850
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/虹光新宇侠/86346643.prefab.meta

@@ -3,5 +3,5 @@ guid: 5cb646be6cdad8d4e98daa676ed40a8c
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 86346643
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/超魔导龙骑士-真红眼龙骑士/37818794.prefab.meta

@@ -3,5 +3,5 @@ guid: 7e302e7b3672db347b946478c8a4ceec
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 37818794
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/邪心英雄 业火翼魔/22160245.prefab.meta

@@ -3,5 +3,5 @@ guid: c346b72104c57f04498719c1c36ca072
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 22160245
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/邪心英雄 恶刃魔王/86676862.prefab.meta

@@ -3,5 +3,5 @@ guid: 97b99618ee31ed949ba50e82d7509b67
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 86676862
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/邪心英雄 暗黑地魔/58332301.prefab.meta

@@ -3,5 +3,5 @@ guid: 52f1d5798620d544da37d97cbe870874
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 58332301
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/邪心英雄 荒野风魔/13293158.prefab.meta

@@ -3,5 +3,5 @@ guid: cf30be2522c567c4c88cf5883d2e3e30
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 13293158
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/黑羽龙/9012916.prefab.meta

@@ -3,5 +3,5 @@ guid: 359488fcdf0a0a84aa2bce476f32825b
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 9012916
+  assetBundleName: 
   assetBundleVariant: 

Assets/MD/Spine/黑蔷薇龙/73580471.prefab.meta

@@ -3,5 +3,5 @@ guid: 94cde999db70e9d45b0ede486b71dc5c
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 73580471
+  assetBundleName: 
   assetBundleVariant: 

Assets/SibylSystem/Menu/Menu.cs

@@ -30,7 +30,7 @@ public class Menu : WindowServantSP
         UIHelper.registEvent(gameObject, "exit_", onClickExit);
         UIHelper.registEvent(gameObject, "animation_", onClickAnimation);
         //MDPRO2 update
-        UIHelper.getByName<UILabel>(gameObject, "version_").text = "2.0.0";
+        UIHelper.getByName<UILabel>(gameObject, "version_").text = "2.0.1";
         Program.I().StartCoroutine(checkUpdate());
     }
 

Assets/SibylSystem/Ocgcore/OCGobjects/gameCard.cs

@@ -1059,6 +1059,8 @@ public class gameCard : OCGobject
                         &&
                         (p_moveBefore.location & (uint)CardLocation.MonsterZone) == 0
                         &&
+                        (p.location & (uint)CardLocation.Overlay) == 0
+                        &&
                         (p.position & (uint)CardPosition.FaceUp) > 0
                         &&
                         ((p.reason & (uint)CardReason.SPSUMMON) > 0

Assets/SibylSystem/Ocgcore/Ocgcore.cs

@@ -8732,6 +8732,7 @@ public class Ocgcore : ServantWithCardDescription
         if (gameInfo.queryHashedButton("sendSelected"))
         {
             sendSelectedCards();
+            Program.I().cardSelection.hide();
             return;
         }
 
@@ -8742,6 +8743,7 @@ public class Ocgcore : ServantWithCardDescription
             var binaryMaster = new BinaryMaster();
             binaryMaster.writer.Write(-1);
             sendReturn(binaryMaster.get());
+            Program.I().cardSelection.hide();
             return;
         }
 
@@ -8759,6 +8761,7 @@ public class Ocgcore : ServantWithCardDescription
             var binaryMaster = new BinaryMaster();
             binaryMaster.writer.Write(-1);
             sendReturn(binaryMaster.get());
+            Program.I().cardSelection.hide();
             return;
         }
 

Assets/SibylSystem/Program.cs

@@ -431,12 +431,18 @@ public class Program : MonoBehaviour
 
         initializeALLservants();
         loadResources();
+        //readParams();
+    }
+
+    private void Start()
+    {
         readParams();
     }
 
     private void readParams()
     {
         var args = Environment.GetCommandLineArgs();
+
         string nick = null;
         string host = null;
         string port = null;
@@ -828,7 +834,7 @@ public class Program : MonoBehaviour
         instance = this;
         initialize();
         gameStart();
-        readParams();
+        //readParams();
     }
 
     private int preWid;

Assets/SibylSystem/Servant.cs

@@ -741,8 +741,7 @@ public class Servant
             Program.I().ui_main_2d
         );
         UIHelper.InterGameObject(currentMSwindow);
-        MyCard.LoadAvatar(name,
-            texture => UIHelper.getByName<UITexture>(currentMSwindow, "face_").mainTexture = texture);
+        //MyCard.LoadAvatar(name, texture => UIHelper.getByName<UITexture>(currentMSwindow, "face_").mainTexture = texture);
         UIHelper.registEvent(currentMSwindow, "yes_", ES_RMSpremono, new messageSystemValue());
     }
 

Assets/SibylSystem/deckManager/DeckManager.cs

@@ -43,19 +43,13 @@ public class DeckManager : ServantWithCardDescription
     public override void show()
     {
         base.show();
-        cameraAngle = 90;
 
-        //Program.I().main_camera.transform.position = new Vector3(0, 30, 0);
-        //Program.I().main_camera.transform.localEulerAngles = new Vector3(90, 0, 0);
-        //Program.cameraFacing = true;
-        //Program.cameraPosition = Program.I().main_camera.transform.position;
-        camrem();
-        //Program.I().light.transform.eulerAngles = new Vector3(70, 0, 0);
-        gameObjectDesk = create_s(Program.I().new_mod_tableInDeckManager);//卡组编辑
-        //关闭UI
         UIHandler.CloseHomeUI();
-        //切换BGM
         BGMHandler.ChangeBGM("deck");
+
+        cameraAngle = 90;
+        camrem();
+        gameObjectDesk = create_s(Program.I().new_mod_tableInDeckManager);//卡组编辑
         gameObjectDesk.layer = 16;
         gameObjectDesk.transform.position = new Vector3(0, 0, 0);
         gameObjectDesk.transform.eulerAngles = new Vector3(90, 0, 0);

Assets/old/Ocgcore/card/Materials/shower_mat.mat

@@ -27,7 +27,7 @@ Material:
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3001
   stringTagMap: {}
   disabledShaderPasses:
   - SHADOWCASTER

Assets/transUI/prefab/trans_roomSingle.prefab

@@ -592,7 +592,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 258355196724612151}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -735, y: 96, z: 0}
+  m_LocalPosition: {x: -730, y: 96, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4341285194245343136}
@@ -629,13 +629,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 450
+  mWidth: 440
   mHeight: 80
   mDepth: 10
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 5.625
+  aspectRatio: 5.5
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 12800000, guid: 154a5b3c6e48fa4448be221e7c4a68de, type: 3}
   mFont: {fileID: 0}
@@ -1746,7 +1746,7 @@ MonoBehaviour:
   anchorOffset: 1
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3014
+  startingRenderQueue: 3015
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 0
@@ -1782,7 +1782,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1935206641008402342}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 212, y: 0, z: 0}
+  m_LocalPosition: {x: 208, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 352746487433637058}
@@ -1861,7 +1861,7 @@ MonoBehaviour:
   mPivot: 4
   mWidth: 25
   mHeight: 596
-  mDepth: 11
+  mDepth: 22
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
@@ -2106,7 +2106,7 @@ MonoBehaviour:
   anchorOffset: 1
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3013
+  startingRenderQueue: 3014
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 0
@@ -2585,7 +2585,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 3.4482758
+  aspectRatio: 3.3333333
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -3747,7 +3747,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5135232188678397487}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -735, y: -242, z: 0}
+  m_LocalPosition: {x: -730, y: -242, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4878985917402770763}
@@ -3786,7 +3786,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 4341285194245343136}
     relative: 0
-    absolute: 0
+    absolute: 10
   rightAnchor:
     target: {fileID: 4341285194245343136}
     relative: 0
@@ -3802,13 +3802,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 450
+  mWidth: 440
   mHeight: 596
   mDepth: 10
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.75503355
+  aspectRatio: 0.738255
 --- !u!1 &5160392139616360095
 GameObject:
   m_ObjectHideFlags: 0
@@ -4242,7 +4242,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6058712711121473665}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -10, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 325468287669612637}
@@ -4263,11 +4263,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 325468287669612637}
     relative: 0
-    absolute: 10
+    absolute: 0
   rightAnchor:
     target: {fileID: 325468287669612637}
     relative: 1
-    absolute: -10
+    absolute: -25
   bottomAnchor:
     target: {fileID: 325468287669612637}
     relative: 0
@@ -4285,11 +4285,11 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3012
+  startingRenderQueue: 3013
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
-  mClipRange: {x: 10, y: 0, z: 430, w: 596}
+  mClipRange: {x: -12.5, y: 0, z: 415, w: 596}
   mClipSoftness: {x: 0, y: 0}
   mDepth: 20
   mSortingOrder: 0
@@ -5027,7 +5027,7 @@ MonoBehaviour:
   anchorOffset: 1
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3012
+  startingRenderQueue: 3013
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 0
@@ -5345,7 +5345,7 @@ MonoBehaviour:
   anchorOffset: 1
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3015
+  startingRenderQueue: 3016
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 0
@@ -6557,7 +6557,7 @@ MonoBehaviour:
   mPivot: 4
   mWidth: 25
   mHeight: 596
-  mDepth: 12
+  mDepth: 23
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0

Assets/transUI/prefab/trans_roomTag.prefab

@@ -241,7 +241,7 @@ MonoBehaviour:
   anchorOffset: 1
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3045
+  startingRenderQueue: 3042
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 0
@@ -762,7 +762,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1826675696057325501}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -10, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6591172490208112224}
@@ -783,11 +783,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 6591172490208112224}
     relative: 0
-    absolute: 10
+    absolute: 0
   rightAnchor:
     target: {fileID: 6591172490208112224}
     relative: 1
-    absolute: -10
+    absolute: -25
   bottomAnchor:
     target: {fileID: 6591172490208112224}
     relative: 0
@@ -805,11 +805,11 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3043
+  startingRenderQueue: 3040
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
-  mClipRange: {x: 10, y: 0, z: 430, w: 596}
+  mClipRange: {x: -12.5, y: 0, z: 425, w: 596}
   mClipSoftness: {x: 0, y: 0}
   mDepth: 20
   mSortingOrder: 0
@@ -883,7 +883,7 @@ MonoBehaviour:
   anchorOffset: 1
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3043
+  startingRenderQueue: 3040
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 0
@@ -1746,7 +1746,7 @@ MonoBehaviour:
   anchorOffset: 1
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3044
+  startingRenderQueue: 3041
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 0
@@ -2316,7 +2316,7 @@ MonoBehaviour:
   mPivot: 4
   mWidth: 25
   mHeight: 596
-  mDepth: 12
+  mDepth: 23
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
@@ -2632,7 +2632,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3032
+  startingRenderQueue: 3028
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 0
@@ -3551,7 +3551,7 @@ MonoBehaviour:
   anchorOffset: 1
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3046
+  startingRenderQueue: 3043
   mClipTexture: {fileID: 2800000, guid: b1f30c8a0354cd94dade78759be28008, type: 3}
   mAlpha: 1
   mClipping: 0
@@ -4147,7 +4147,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 3.4482758
+  aspectRatio: 3.3333333
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -5439,7 +5439,7 @@ MonoBehaviour:
   mPivot: 4
   mWidth: 25
   mHeight: 596
-  mDepth: 11
+  mDepth: 22
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0

Assets/transUI/prefab/trans_selection_new.prefab

@@ -253,7 +253,7 @@ MonoBehaviour:
   mPivot: 4
   mWidth: 200
   mHeight: 30
-  mDepth: 25
+  mDepth: 21
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0

Packages/manifest.json

 {
   "dependencies": {
     "com.unity.2d.sprite": "1.0.0",
-    "com.unity.ide.rider": "3.0.7",
-    "com.unity.ide.visualstudio": "2.0.16",
-    "com.unity.ide.vscode": "1.2.3",
+    "com.unity.ide.rider": "3.0.18",
+    "com.unity.ide.visualstudio": "2.0.17",
+    "com.unity.ide.vscode": "1.2.5",
     "com.unity.postprocessing": "3.2.2",
-    "com.unity.render-pipelines.universal": "10.9.0",
-    "com.unity.test-framework": "1.1.29",
+    "com.unity.render-pipelines.universal": "10.10.1",
+    "com.unity.test-framework": "1.1.33",
     "com.unity.timeline": "1.5.6",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",

Packages/packages-lock.json

@@ -20,7 +20,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.7",
+      "version": "3.0.18",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -29,7 +29,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.16",
+      "version": "2.0.17",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -38,7 +38,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
-      "version": "1.2.3",
+      "version": "1.2.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -61,7 +61,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.render-pipelines.core": {
-      "version": "10.9.0",
+      "version": "10.10.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -72,13 +72,13 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.render-pipelines.universal": {
-      "version": "10.9.0",
+      "version": "10.10.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.mathematics": "1.1.0",
-        "com.unity.render-pipelines.core": "10.9.0",
-        "com.unity.shadergraph": "10.9.0"
+        "com.unity.render-pipelines.core": "10.10.1",
+        "com.unity.shadergraph": "10.10.1"
       },
       "url": "https://packages.unity.com"
     },
@@ -90,17 +90,17 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.shadergraph": {
-      "version": "10.9.0",
+      "version": "10.10.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.render-pipelines.core": "10.9.0",
+        "com.unity.render-pipelines.core": "10.10.1",
         "com.unity.searcher": "4.3.2"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.29",
+      "version": "1.1.33",
       "depth": 0,
       "source": "registry",
       "dependencies": {

ProjectSettings/ProjectVersion.txt

-m_EditorVersion: 2020.3.32f1
-m_EditorVersionWithRevision: 2020.3.32f1 (12f8b0834f07)
+m_EditorVersion: 2020.3.46f1
+m_EditorVersionWithRevision: 2020.3.46f1 (18bc01a066b4)