Skip to content

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

fix loading bug

parent 32516fb5
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 313 deletions
Assets/AddressableAssetsData/link.xml deleted 100644 → 0
View file @ 32516fb5
<linker>
<assembly fullname="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="DoWhenOnDrag" preserve="all" />
<type fullname="DuelLog" preserve="all" />
<type fullname="DuelPrefabContainer" preserve="all" />
<type fullname="MDPro3.Appearance" preserve="all" />
<type fullname="MDPro3.AudioManager" preserve="all" />
<type fullname="MDPro3.BackgroundManager" preserve="all" />
<type fullname="MDPro3.CameraManager" preserve="all" />
<type fullname="MDPro3.CardDescription" preserve="all" />
<type fullname="MDPro3.CardDetail" preserve="all" />
<type fullname="MDPro3.CardRenderer" preserve="all" />
<type fullname="MDPro3.EditDeck" preserve="all" />
<type fullname="MDPro3.GameCardMono" preserve="all" />
<type fullname="MDPro3.Items" preserve="all" />
<type fullname="MDPro3.MateView" preserve="all" />
<type fullname="MDPro3.Menu" preserve="all" />
<type fullname="MDPro3.MessageManager" preserve="all" />
<type fullname="MDPro3.MonsterCutin" preserve="all" />
<type fullname="MDPro3.OcgCore" preserve="all" />
<type fullname="MDPro3.Online" preserve="all" />
<type fullname="MDPro3.Program" preserve="all" />
<type fullname="MDPro3.Room" preserve="all" />
<type fullname="MDPro3.RoomPlayer" preserve="all" />
<type fullname="MDPro3.SelectDeck" preserve="all" />
<type fullname="MDPro3.SelectPuzzle" preserve="all" />
<type fullname="MDPro3.SelectReplay" preserve="all" />
<type fullname="MDPro3.Setting" preserve="all" />
<type fullname="MDPro3.Solo" preserve="all" />
<type fullname="MDPro3.TextureManager" preserve="all" />
<type fullname="MDPro3.TimeLineManager" preserve="all" />
<type fullname="MDPro3.UI.AppearanceItem" preserve="all" />
<type fullname="MDPro3.UI.AutoScale" preserve="all" />
<type fullname="MDPro3.UI.ButtonHold" preserve="all" />
<type fullname="MDPro3.UI.ButtonHover" preserve="all" />
<type fullname="MDPro3.UI.ButtonList" preserve="all" />
<type fullname="MDPro3.UI.ButtonListForAppearance" preserve="all" />
<type fullname="MDPro3.UI.ButtonListForAppearancePlayer" preserve="all" />
<type fullname="MDPro3.UI.ButtonPress" preserve="all" />
<type fullname="MDPro3.UI.ButtonSpriteSwap" preserve="all" />
<type fullname="MDPro3.UI.ButtonSwitchForDeckPickup" preserve="all" />
<type fullname="MDPro3.UI.CardList" preserve="all" />
<type fullname="MDPro3.UI.CardListItem" preserve="all" />
<type fullname="MDPro3.UI.CardOnEdit" preserve="all" />
<type fullname="MDPro3.UI.CleanTextButton" preserve="all" />
<type fullname="MDPro3.UI.DuelButton" preserve="all" />
<type fullname="MDPro3.UI.EventDrag" preserve="all" />
<type fullname="MDPro3.UI.HintAutoMove" preserve="all" />
<type fullname="MDPro3.UI.HorizontalScrollbarMouseWheel" preserve="all" />
<type fullname="MDPro3.UI.InputFieldSubmit" preserve="all" />
<type fullname="MDPro3.UI.InputValidation" preserve="all" />
<type fullname="MDPro3.UI.LinkClickHandler" preserve="all" />
<type fullname="MDPro3.UI.NewText" preserve="all" />
<type fullname="MDPro3.UI.PopupConfirm" preserve="all" />
<type fullname="MDPro3.UI.PopupDuelInput" preserve="all" />
<type fullname="MDPro3.UI.PopupDuelPhase" preserve="all" />
<type fullname="MDPro3.UI.PopupDuelPosition" preserve="all" />
<type fullname="MDPro3.UI.PopupDuelSelectCard" preserve="all" />
<type fullname="MDPro3.UI.PopupDuelSelectCardItem" preserve="all" />
<type fullname="MDPro3.UI.PopupDuelSelection" preserve="all" />
<type fullname="MDPro3.UI.PopupDuelYesOrNo" preserve="all" />
<type fullname="MDPro3.UI.PopupInput" preserve="all" />
<type fullname="MDPro3.UI.PopupRockPaperScissors" preserve="all" />
<type fullname="MDPro3.UI.PopupSearchFilter" preserve="all" />
<type fullname="MDPro3.UI.PopupSearchOrder" preserve="all" />
<type fullname="MDPro3.UI.PopupSelection" preserve="all" />
<type fullname="MDPro3.UI.PopupServer" preserve="all" />
<type fullname="MDPro3.UI.PopupText" preserve="all" />
<type fullname="MDPro3.UI.PopupYesOrNo" preserve="all" />
<type fullname="MDPro3.UI.ShowFPS" preserve="all" />
<type fullname="MDPro3.UI.SuperScrollViewItemForAddress" preserve="all" />
<type fullname="MDPro3.UI.SuperScrollViewItemForCutin" preserve="all" />
<type fullname="MDPro3.UI.SuperScrollViewItemForDeck" preserve="all" />
<type fullname="MDPro3.UI.SuperScrollViewItemForDeckEdit" preserve="all" />
<type fullname="MDPro3.UI.SuperScrollViewItemForMate" preserve="all" />
<type fullname="MDPro3.UI.SuperScrollViewItemForSelection" preserve="all" />
<type fullname="MDPro3.UI.SuperScrollViewItemTwoStageForPuzzle" preserve="all" />
<type fullname="MDPro3.UI.SuperScrollViewItemTwoStageForReplay" preserve="all" />
<type fullname="MDPro3.UI.SuperScrollViewItemTwoStageForSolo" preserve="all" />
<type fullname="MDPro3.UI.Tab" preserve="all" />
<type fullname="MDPro3.UI.Tabs" preserve="all" />
<type fullname="MDPro3.UI.Toggle" preserve="all" />
<type fullname="MDPro3.UI.ToggleForDeckDelete" preserve="all" />
<type fullname="MDPro3.UI.ToggleForSearchFilter" preserve="all" />
<type fullname="MDPro3.UI.ToggleForSearchOrder" preserve="all" />
<type fullname="MDPro3.UI.UIEventWithAudio" preserve="all" />
<type fullname="MDPro3.UI.UIHover" preserve="all" />
<type fullname="MDPro3.UIManager" preserve="all" />
<type fullname="TextureContainer" preserve="all" />
<type fullname="YgomSystem.Effect.ScreenEffect" preserve="all" />
<type fullname="YgomSystem.ElementSystem.ElementObject" preserve="all" />
<type fullname="YgomSystem.ElementSystem.ElementObjectManager" preserve="all" />
<type fullname="YgomSystem.Timeline.SoundPlayableAsset" preserve="all" />
<type fullname="YgomSystem.Timeline.SoundTrack" preserve="all" />
<type fullname="YgomSystem.UI.TweenEvent" preserve="all" />
<type fullname="YgomSystem.UI.TweenPosition" preserve="all" />
<type fullname="YgomSystem.UI.TweenPositionTo" preserve="all" />
<type fullname="YgomSystem.UI.TweenRotation" preserve="all" />
<type fullname="YgomSystem.UI.TweenScale" preserve="all" />
<type fullname="YgomSystem.UI.TweenScaleTo" preserve="all" />
<type fullname="YgomSystem.UI.TweenSpriteColor" preserve="all" />
<type fullname="MDPro3.UI.StringUnityEvent" preserve="nothing" serialized="true" />
<type fullname="MDPro3.Items/Item" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
</assembly>
<assembly fullname="Unity.InputSystem, Version=1.8.2.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.InputSystem.InputActionAsset" preserve="all" />
<type fullname="UnityEngine.InputSystem.InputActionReference" preserve="all" />
<type fullname="UnityEngine.InputSystem.UI.InputSystemUIInputModule" preserve="all" />
<type fullname="UnityEngine.InputSystem.InputAction" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.InputSystem.InputActionMap" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.InputSystem.InputBinding" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.InputSystem.InputControlScheme" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.InputSystem.InputControlScheme/DeviceRequirement" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="Unity.RenderPipelines.Core.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Rendering.VolumeProfile" preserve="all" />
<type fullname="UnityEngine.Rendering.BoolParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ClampedFloatParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ClampedIntParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ColorParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.MinFloatParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ProbeVolumeBlendingTextureMemoryBudget" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ProbeVolumeSHBands" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ProbeVolumeSceneData" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.ProbeVolumeTextureMemoryBudget" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.SerializedDictionary`2" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.TextureParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Vector2Parameter" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Rendering.Universal.Bloom" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.ChromaticAberration" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.DepthOfField" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.LensDistortion" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.MotionBlur" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.PostProcessData" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.UniversalAdditionalCameraData" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.UniversalRendererData" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.UniversalRenderPipelineAsset" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.Vignette" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.DepthOfFieldModeParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.DownscaleParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.MotionBlurModeParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.MotionBlurQualityParameter" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.PostProcessData/ShaderResources" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.PostProcessData/TextureResources" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.ScriptableRendererData/DebugShaderResources" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.ScriptableRendererData/ProbeVolumeResources" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.StencilStateData" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.TemporalAA/Settings" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Rendering.Universal.UniversalRenderPipelineAsset/TextureResources" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.AtlasSpriteProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
</assembly>
<assembly fullname="Unity.TextMeshPro, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="TMPro.TextMeshPro" preserve="all" />
<type fullname="TMPro.TextMeshProUGUI" preserve="all" />
<type fullname="TMPro.TMP_FontAsset" preserve="all" />
<type fullname="TMPro.VertexGradient" preserve="nothing" serialized="true" />
<type fullname="TMPro.FaceInfo_Legacy" preserve="nothing" serialized="true" />
<type fullname="TMPro.FontAssetCreationSettings" preserve="nothing" serialized="true" />
<type fullname="TMPro.KerningTable" preserve="nothing" serialized="true" />
<type fullname="TMPro.TMP_Character" preserve="nothing" serialized="true" />
<type fullname="TMPro.TMP_FontFeatureTable" preserve="nothing" serialized="true" />
<type fullname="TMPro.TMP_FontWeightPair" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="Unity.Timeline, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Timeline.ActivationPlayableAsset" preserve="all" />
<type fullname="UnityEngine.Timeline.ActivationTrack" preserve="all" />
<type fullname="UnityEngine.Timeline.AnimationPlayableAsset" preserve="all" />
<type fullname="UnityEngine.Timeline.AnimationTrack" preserve="all" />
<type fullname="UnityEngine.Timeline.MarkerTrack" preserve="all" />
<type fullname="UnityEngine.Timeline.TimelineAsset" preserve="all" />
<type fullname="UnityEngine.Timeline.MarkerList" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Timeline.TimelineAsset/EditorSettings" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Timeline.TimelineClip" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Animation" preserve="all" />
<type fullname="UnityEngine.AnimationClip" preserve="all" />
<type fullname="UnityEngine.Animator" preserve="all" />
<type fullname="UnityEngine.AnimatorOverrideController" preserve="all" />
<type fullname="UnityEngine.Avatar" preserve="all" />
<type fullname="UnityEngine.RuntimeAnimatorController" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.AudioModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.AudioClip" preserve="all" />
<type fullname="UnityEngine.AudioListener" preserve="all" />
<type fullname="UnityEngine.AudioSource" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Camera" preserve="all" />
<type fullname="UnityEngine.GameObject" preserve="all" />
<type fullname="UnityEngine.Light" preserve="all" />
<type fullname="UnityEngine.LightmapSettings" preserve="all" />
<type fullname="UnityEngine.Material" preserve="all" />
<type fullname="UnityEngine.Mesh" preserve="all" />
<type fullname="UnityEngine.MeshFilter" preserve="all" />
<type fullname="UnityEngine.MeshRenderer" preserve="all" />
<type fullname="UnityEngine.Object" preserve="all" />
<type fullname="UnityEngine.RectTransform" preserve="all" />
<type fullname="UnityEngine.Rendering.SortingGroup" preserve="all" />
<type fullname="UnityEngine.RenderSettings" preserve="all" />
<type fullname="UnityEngine.RenderTexture" preserve="all" />
<type fullname="UnityEngine.Shader" preserve="all" />
<type fullname="UnityEngine.Sprite" preserve="all" />
<type fullname="UnityEngine.SpriteRenderer" preserve="all" />
<type fullname="UnityEngine.TextAsset" preserve="all" />
<type fullname="UnityEngine.Texture2D" preserve="all" />
<type fullname="UnityEngine.Transform" preserve="all" />
<type fullname="UnityEngine.U2D.SpriteAtlas" preserve="all" />
<type fullname="UnityEngine.Bounds" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Events.ArgumentCache" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Events.PersistentCallGroup" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Events.PersistentListenerMode" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Events.UnityEvent" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="UnityEngine.DirectorModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Playables.PlayableDirector" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.BoxCollider" preserve="all" />
<type fullname="UnityEngine.MeshCollider" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.TextRenderingModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Font" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.EventSystems.EventSystem" preserve="all" />
<type fullname="UnityEngine.UI.AspectRatioFitter" preserve="all" />
<type fullname="UnityEngine.UI.Button" preserve="all" />
<type fullname="UnityEngine.UI.CanvasScaler" preserve="all" />
<type fullname="UnityEngine.UI.ContentSizeFitter" preserve="all" />
<type fullname="UnityEngine.UI.GraphicRaycaster" preserve="all" />
<type fullname="UnityEngine.UI.Image" preserve="all" />
<type fullname="UnityEngine.UI.InputField" preserve="all" />
<type fullname="UnityEngine.UI.Mask" preserve="all" />
<type fullname="UnityEngine.UI.RawImage" preserve="all" />
<type fullname="UnityEngine.UI.RectMask2D" preserve="all" />
<type fullname="UnityEngine.UI.Scrollbar" preserve="all" />
<type fullname="UnityEngine.UI.ScrollRect" preserve="all" />
<type fullname="UnityEngine.UI.Slider" preserve="all" />
<type fullname="UnityEngine.UI.Text" preserve="all" />
<type fullname="UnityEngine.UI.Toggle" preserve="all" />
<type fullname="UnityEngine.UI.AnimationTriggers" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.Button/ButtonClickedEvent" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.ColorBlock" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.FontData" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.InputField/EndEditEvent" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.InputField/OnChangeEvent" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.InputField/SubmitEvent" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.MaskableGraphic/CullStateChangedEvent" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.Navigation" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.ScrollRect/ScrollRectEvent" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.Scrollbar/ScrollEvent" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.Slider/SliderEvent" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.SpriteState" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.Toggle/ToggleEvent" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Canvas" preserve="all" />
<type fullname="UnityEngine.CanvasGroup" preserve="all" />
<type fullname="UnityEngine.CanvasRenderer" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.TextCoreFontEngineModule">
<type fullname="UnityEngine.TextCore.FaceInfo" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.TextCore.Glyph" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.TextCore.GlyphMetrics" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.TextCore.GlyphRect" preserve="nothing" serialized="true" />
</assembly>
</linker>
\ No newline at end of file
Assets/AddressableAssetsData/link.xml.meta deleted 100644 → 0
View file @ 32516fb5
fileFormatVersion: 2
guid: 46926d080847e63419c875a38c3714bd
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Main.unity
View file @ 713cb946
......@@ -7251,7 +7251,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99957, y: 0}
m_AnchoredPosition: {x: -399.99963, y: 0}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &129642814
......@@ -8176,7 +8176,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -490.00006, y: 0}
m_AnchoredPosition: {x: -490.00012, y: 0}
m_SizeDelta: {x: 490, y: 2000}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &153416284
......@@ -10585,7 +10585,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49957, y: -540}
m_AnchoredPosition: {x: 247.49963, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &203992981
......@@ -13635,7 +13635,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49957, y: -540}
m_AnchoredPosition: {x: 247.49963, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &250597853
......@@ -16799,7 +16799,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1581995138}
m_Direction: 2
m_Value: 0
m_Size: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -16879,7 +16879,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49957, y: -540}
m_AnchoredPosition: {x: 247.49963, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &296823158
......@@ -19237,7 +19237,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99957, y: 300}
m_AnchoredPosition: {x: -399.99963, y: 300}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &365844423
......@@ -37505,7 +37505,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49957, y: -540}
m_AnchoredPosition: {x: 247.49963, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &681567863
......@@ -40276,7 +40276,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -419.99957, y: -60}
m_AnchoredPosition: {x: -419.99963, y: -60}
m_SizeDelta: {x: 400, y: 760}
m_Pivot: {x: 0, y: 1}
--- !u!114 &736958434
......@@ -41825,7 +41825,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 476827028}
m_Direction: 2
m_Value: 1
m_Size: 0.62434137
m_Size: 0.6234872
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -54287,7 +54287,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 399.99957, y: -132}
m_AnchoredPosition: {x: 399.99963, y: -132}
m_SizeDelta: {x: 330, y: 840}
m_Pivot: {x: 1, y: 1}
--- !u!114 &998933908
......@@ -54748,7 +54748,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49957, y: -540}
m_AnchoredPosition: {x: 247.49963, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1005556390
......@@ -55482,7 +55482,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 948258731}
m_Direction: 2
m_Value: 0
m_Size: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -73369,7 +73369,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49957, y: -540}
m_AnchoredPosition: {x: 247.49963, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1371617110
......@@ -73521,7 +73521,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99957, y: 150}
m_AnchoredPosition: {x: -399.99963, y: 150}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1374530642
......@@ -81142,7 +81142,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 2083794100}
m_Direction: 2
m_Value: 0
m_Size: 0.55882347
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -98956,7 +98956,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99957, y: -150}
m_AnchoredPosition: {x: -399.99963, y: -150}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1800729521
......@@ -104111,7 +104111,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49957, y: -540}
m_AnchoredPosition: {x: 247.49963, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1895460095
Assets/Scripts/MDPro3/Managers/TextureManager.cs
View file @ 713cb946
......@@ -657,7 +657,6 @@ namespace MDPro3
else
return container.typeLevel;
}
public static Sprite GetCardCounterIcon(int counter)
{
switch (counter)
......
Assets/Scripts/MDPro3/Servants/EditDeck.cs
View file @ 713cb946
......@@ -184,7 +184,8 @@ namespace MDPro3
{
Dispose();
if (superScrollView != null)
superScrollView.Clear();
foreach (var item in superScrollView.items)
item.gameObject.GetComponent<SuperScrollViewItemForDeckEdit>().Dispose();
});
}
}
......
Assets/Scripts/MDPro3/Servants/SelectDeck.cs
View file @ 713cb946
......@@ -20,7 +20,7 @@ namespace MDPro3
SuperScrollView superScrollView;
public Dictionary<string, Deck> decks = new Dictionary<string, Deck>();
public List<SuperScrollViewItemForDeck> items;
public List<SuperScrollViewItemForDeckSelect> items;
public ButtonSwitchForDeckPickup btnPickup;
public ToggleForDeckDelete btnDelete;
......@@ -53,7 +53,9 @@ namespace MDPro3
DOTween.To(v => { }, 0, 0, transitionTime).OnComplete(() =>
{
btnPickup.OnSwitchOff();
superScrollView.Clear();
if(superScrollView != null)
foreach (var item in superScrollView.items)
item.gameObject.GetComponent<SuperScrollViewItemForDeckSelect>().Dispose();
Clear();
depth = 1;
state = State.ForEdit;
......@@ -152,7 +154,7 @@ namespace MDPro3
void ItemOnListRefresh(string[] task, GameObject item)
{
var handler = item.GetComponent<SuperScrollViewItemForDeck>();
var handler = item.GetComponent<SuperScrollViewItemForDeckSelect>();
handler.deckName = task[0];
handler.deckCase = int.Parse(task[1]);
handler.card1 = int.Parse(task[2]);
......
Assets/Scripts/MDPro3/Servants/Solo.cs
View file @ 713cb946
......@@ -28,6 +28,8 @@ namespace MDPro3
public InputField inputHand;
public InputField inputDraw;
public GameObject btnDeck;
public static readonly int diyAI = 6;
public class BotInfo
{
public string name;
......@@ -154,7 +156,7 @@ namespace MDPro3
{
BotInfo bot = bots[aiCode];
string aiCommand = bot.command;
if (aiCode == 4)
if (aiCode == diyAI)
{
string selectedDeck = btnDeck.transform.GetChild(0).GetComponent<Text>().text;
if (!File.Exists("Deck/" + selectedDeck + ".ydk"))
......
Assets/Scripts/MDPro3/UI/SuperScrollView/SuperScrollView.cs
View file @ 713cb946
......@@ -56,7 +56,7 @@ namespace MDPro3.UI
scrollView.verticalScrollbar.onValueChanged.AddListener(OnScrollBarChange);
}
public void Clear()
public virtual void Clear()
{
foreach (var item in items)
UnityEngine.Object.Destroy(item.gameObject);
......
Assets/Scripts/MDPro3/UI/SuperScrollView/SuperScrollViewItemForDeckEdit.cs
View file @ 713cb946
......@@ -169,6 +169,18 @@ namespace MDPro3.UI
refreshed = true;
}
public void Dispose()
{
StartCoroutine(DisposeAsync());
}
IEnumerator DisposeAsync()
{
while(!refreshed)
yield return null;
Destroy(gameObject);
}
void OnClick(PointerEventData eventData)
{
if (!refreshed)
......
Assets/Scripts/MDPro3/UI/SuperScrollView/SuperScrollViewItemForDeck.cs → Assets/Scripts/MDPro3/UI/SuperScrollView/SuperScrollViewItemForDeckSelect.cs
View file @ 713cb946
......@@ -7,7 +7,7 @@ using UnityEngine.UI;
namespace MDPro3.UI
{
public class SuperScrollViewItemForDeck : SuperScrollViewItem, IPointerEnterHandler, IPointerExitHandler
public class SuperScrollViewItemForDeckSelect : SuperScrollViewItem, IPointerEnterHandler, IPointerExitHandler
{
public string deckName;
public int deckCase;
......@@ -44,8 +44,10 @@ namespace MDPro3.UI
StartCoroutine(RefreshAsync());
}
bool refreshed;
IEnumerator RefreshAsync()
{
refreshed = false;
textName.text = deckName;
var casePath = deckCase.ToString();
var load = TextureManager.LoadItemIcon(casePath);
......@@ -125,6 +127,19 @@ namespace MDPro3.UI
cardFace3.texture = null;
cardFace3.material = pMat;
}
refreshed = true;
}
public void Dispose()
{
StartCoroutine(DisposeAsync());
}
IEnumerator DisposeAsync()
{
while(!refreshed)
yield return null;
Destroy(gameObject);
}
public override void OnClick()
......
Assets/Scripts/MDPro3/UI/SuperScrollView/SuperScrollViewItemTwoStageForSolo.cs
View file @ 713cb946
......@@ -19,7 +19,7 @@ namespace MDPro3.UI
Program.I().solo.superScrollView.selected = id;
Program.I().solo.description.text = botInfo.desc;
Program.I().solo.description.GetComponent<RectTransform>().anchoredPosition = Vector2.zero;
if(id == 4)
if(id == Solo.diyAI)
Program.I().solo.btnDeck.SetActive(true);
else
Program.I().solo.btnDeck.SetActive(false);
......
Data/script.zip
View file @ 713cb946
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment