Skip to content

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

update so

parent 6a82457d
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 49 deletions
Assets/AssetBundles/Duel/Timeline/DuelCardModel/DuelCardModel.prefab
View file @ 1580ff45
......@@ -366,7 +366,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 16
m_fontSize: 24.15
m_fontSizeBase: 14
m_fontWeight: 400
m_enableAutoSizing: 1
......@@ -450,7 +450,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 2, y: 2}
m_SizeDelta: {x: 2.2, y: 2.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1809307035775939451
MonoBehaviour:
......@@ -466,11 +466,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
decideByUser: 1
m_AnchoredPosition:
m_DefaultValue: {x: 1, y: 0}
m_MobileValue: {x: 1.2, y: 0}
m_DefaultValue: {x: 0, y: 0}
m_MobileValue: {x: 0, y: 0}
m_SizeDelta:
m_DefaultValue: {x: 2, y: 2}
m_MobileValue: {x: 2, y: 2.4}
m_DefaultValue: {x: 2.2, y: 2.2}
m_MobileValue: {x: 2.5, y: 2.5}
debug: 0
--- !u!23 &23265502084187947
MeshRenderer:
......@@ -579,13 +579,13 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 20
m_fontSize: 26.6
m_fontSizeBase: 14.4
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 1
m_fontSizeMax: 30
m_fontStyle: 0
m_fontSizeMax: 50
m_fontStyle: 1
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
......@@ -2366,7 +2366,7 @@ Transform:
m_GameObject: {fileID: 1206038004096676}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.8, y: 0, z: 0}
m_LocalPosition: {x: -1.1, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
......@@ -3585,7 +3585,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 2, y: 2}
m_SizeDelta: {x: 2.2, y: 2.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8444792738626834373
MonoBehaviour:
......@@ -3601,11 +3601,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
decideByUser: 1
m_AnchoredPosition:
m_DefaultValue: {x: 1, y: 0}
m_MobileValue: {x: 1.2, y: 0}
m_DefaultValue: {x: 0, y: 0}
m_MobileValue: {x: 0, y: 0}
m_SizeDelta:
m_DefaultValue: {x: 2, y: 2}
m_MobileValue: {x: 2, y: 2.4}
m_DefaultValue: {x: 2.2, y: 2.2}
m_MobileValue: {x: 2.5, y: 2.5}
debug: 0
--- !u!23 &23079333251260416
MeshRenderer:
......@@ -3714,13 +3714,13 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 20
m_fontSize: 26.6
m_fontSizeBase: 14.4
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 1
m_fontSizeMax: 30
m_fontStyle: 0
m_fontSizeMax: 50
m_fontStyle: 1
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
......@@ -8118,7 +8118,7 @@ Transform:
m_GameObject: {fileID: 1686716204287271}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.8, y: 0, z: 0}
m_LocalPosition: {x: 1.1, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
......@@ -8967,7 +8967,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &4346528796340245
Transform:
m_ObjectHideFlags: 0
......
Assets/Resources/Settings/UniversalRenderPipelineGlobalSettings.asset
View file @ 1580ff45
......@@ -36,21 +36,21 @@ MonoBehaviour:
- rid: 5650211206403981510
- rid: 5650211206403981511
- rid: 5650211206403981512
- rid: 260125053741695126
- rid: 260125208178851999
- rid: 5650211206403981514
- rid: 5650211206403981515
- rid: 260125053741695127
- rid: 260125053741695128
- rid: 260125208178852000
- rid: 260125208178852001
- rid: 5650211206403981518
- rid: 260125053741695129
- rid: 260125208178852002
- rid: 5650211206403981520
- rid: 260125053741695130
- rid: 260125053741695131
- rid: 260125053741695132
- rid: 260125053741695133
- rid: 260125053741695134
- rid: 260125053741695135
- rid: 260125053741695136
- rid: 260125208178852003
- rid: 260125208178852004
- rid: 260125208178852005
- rid: 260125208178852006
- rid: 260125208178852007
- rid: 260125208178852008
- rid: 260125208178852009
- rid: 5650211206403981528
- rid: 5650211206403981529
- rid: 5650211206403981530
......@@ -96,7 +96,7 @@ MonoBehaviour:
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
- rid: 260125053741695126
- rid: 260125208178851999
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
......@@ -111,14 +111,14 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 260125053741695127
- rid: 260125208178852000
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
- rid: 260125053741695128
- rid: 260125208178852001
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
......@@ -126,7 +126,7 @@ MonoBehaviour:
m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
- rid: 260125053741695129
- rid: 260125208178852002
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
......@@ -138,7 +138,7 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 260125053741695130
- rid: 260125208178852003
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
......@@ -151,13 +151,13 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 260125053741695131
- rid: 260125208178852004
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
- rid: 260125053741695132
- rid: 260125208178852005
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -170,12 +170,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 260125053741695133
- rid: 260125208178852006
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 260125053741695134
- rid: 260125208178852007
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -185,14 +185,14 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 260125053741695135
- rid: 260125208178852008
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 260125053741695136
- rid: 260125208178852009
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......
Assets/Scenes/ABRobber.unity
View file @ 1580ff45
......@@ -536,9 +536,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
text: {fileID: 1398959084}
input: {fileID: 1775272994}
mode_Window: 1
mode_Window: 0
mode_Android: 0
mode_IOS: 0
mode_IOS: 1
fullCopy: 0
--- !u!114 &916768208
MonoBehaviour:
......
Assets/Scenes/Main.unity
View file @ 1580ff45
......@@ -7991,7 +7991,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 600.0001, y: 0}
m_AnchoredPosition: {x: 600.0002, y: 0}
m_SizeDelta: {x: 600, y: 0}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1850716665
......
Assets/Scripts/MDPro3/Duel/GameCard.cs
View file @ 1580ff45
......@@ -1349,9 +1349,9 @@ namespace MDPro3
if (p.InLocation(CardLocation.Removed)
|| p.InLocation(CardLocation.Deck)
|| p.InLocation(CardLocation.Extra))
sequence.Join(turn.DOLocalRotate(new Vector3(0, 0, rotation.z), moveTime * 0.8f));
sequence.Join(turn.DOLocalRotate(new Vector3(0, 0, rotation.z), moveTime * 0.6f));
else
sequence.Join(turn.DOLocalRotate(new Vector3(0, (rotation.y == 0) || (rotation.y == 180) ? 0 : 270, rotation.z), moveTime * 0.8f).SetEase(ease));
sequence.Join(turn.DOLocalRotate(new Vector3(0, (rotation.y == 0) || (rotation.y == 180) ? 0 : 270, rotation.z), moveTime * 0.6f).SetEase(ease));
if (handAppeal && overrideMoveTime == 0)
{
sequence.Join(turn.DOLocalMove(new Vector3(0, 0, 10), moveTime).SetEase(Ease.OutCubic).OnComplete(() =>
......
Assets/Scripts/MasterDuel/YgomGame/Bg/BgEffectManagerInner.cs
View file @ 1580ff45
......@@ -274,12 +274,20 @@ namespace YgomGame.Bg
}
var se = "SE_FIELD_MAT" + name.Substring(4, 3) + "_TAP";
AudioManager.PlaySE(se);
try
{
AudioManager.PlaySE(se);
}
catch { }
if (name.ToLower().Contains("near"))
se += "_P";
else
se += "_R";
AudioManager.PlaySE(se);
try
{
AudioManager.PlaySE(se);
}
catch { }
}
public bool IsTapPlaying()
......
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