Skip to content

M
MDPro3
Commit 08b6b630 authored by SherryChaos's avatar SherryChaos
Browse files
Options

auto speed-up setting & face-down card showing

parent 7e318954
Show whitespace changes
Inline Side-by-side
Showing with 3902 additions and 262 deletions
Assets/Addressables/Text/UpdateContent.txt
View file @ 08b6b630
MDPro3 v1.1.3更新： MDPro3 v1.1.3更新：
1.修复SelectSum消息中，可选卡片数量为1时，点击不可选卡片会导致游戏无响应的错误。 1.现在能设置决斗开始时是否自动加速了。
2.修复上版本中，更改设置中的[画面质量]导致游戏背景异常的错误。 2.现在能显示已知盖卡了，设置中可以关闭。
3.修复SelectSum消息中，可选卡片数量为1时，点击不可选卡片会导致游戏无法继续的错误。
4.修复上版本中，更改设置中的[画面质量]导致游戏背景异常的错误。
5.修复部分情况下立绘为空白的错误。
MDPro3 v1.1.2更新： MDPro3 v1.1.2更新：
1.现在房主能在房间中添加AI进行游戏了。 1.现在房主能在房间中添加AI进行游戏了。
......
Assets/Main.unity
View file @ 08b6b630
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Model/CardModelWrapper/Closeup.controller → Assets/Model/CardModelWrapper/AC_Closeup.controller
View file @ 08b6b630
...@@ -54,7 +54,7 @@ AnimatorController: ...@@ -54,7 +54,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Closeup m_Name: AC_Closeup
serializedVersion: 5 serializedVersion: 5
m_AnimatorParameters: [] m_AnimatorParameters: []
m_AnimatorLayers: m_AnimatorLayers:
......
Assets/Model/CardModelWrapper/AC_ShowFaceDownCard.controller 0 → 100644
View file @ 08b6b630
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-8881660850234351760
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 6098830902831485940}
m_Position: {x: 300, y: 140, z: 0}
- serializedVersion: 1
m_State: {fileID: 5319932641940596225}
m_Position: {x: 300, y: 50, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions:
- {fileID: 3094415854061037713}
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 6098830902831485940}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: AC_ShowFaceDownCard
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Show
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -8881660850234351760}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1706602603142098741
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Show
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 5319932641940596225}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1109 &3094415854061037713
AnimatorTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6098830902831485940}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!1102 &5319932641940596225
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ShowFaceDownCard
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 8477353851463834322}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: a9aefb2eec36dc54c8884b612fdd47c1, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &6098830902831485940
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: HideFaceDownCard
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1706602603142098741}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: f385a74c5c0662e4f81d3b2829cc5dda, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8477353851463834322
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Show
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6098830902831485940}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
Assets/Model/CardModelWrapper/AC_ShowFaceDownCard.controller.meta 0 → 100644
View file @ 08b6b630
fileFormatVersion: 2
guid: c68f8f49b3abe8d41ac5189cadfd0371
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Model/CardModelWrapper/Closeup Loop.anim → Assets/Model/CardModelWrapper/Ani_Closeup Loop.anim
View file @ 08b6b630
...@@ -6,7 +6,7 @@ AnimationClip: ...@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Closeup Loop m_Name: Ani_Closeup Loop
serializedVersion: 7 serializedVersion: 7
m_Legacy: 0 m_Legacy: 0
m_Compressed: 0 m_Compressed: 0
......
Assets/Model/CardModelWrapper/Ani_HideFaceDownCard.anim 0 → 100644
View file @ 08b6b630
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Ani_HideFaceDownCard
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._LoadingBlend
path:
classID: 23
script: {fileID: 0}
flags: 16
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 2244188500
script: {fileID: 0}
typeID: 23
customType: 22
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._LoadingBlend
path:
classID: 23
script: {fileID: 0}
flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
Assets/Model/CardModelWrapper/Ani_HideFaceDownCard.anim.meta 0 → 100644
View file @ 08b6b630
fileFormatVersion: 2
guid: f385a74c5c0662e4f81d3b2829cc5dda
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Model/CardModelWrapper/Ani_ShowFaceDownCard.anim 0 → 100644
View file @ 08b6b630
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Ani_ShowFaceDownCard
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.8
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 0.2
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3.0166667
value: 0.2
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5
value: 0.8
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._LoadingBlend
path:
classID: 23
script: {fileID: 0}
flags: 16
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 2244188500
script: {fileID: 0}
typeID: 23
customType: 22
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 5
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.8
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 0.2
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3.0166667
value: 0.2
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5
value: 0.8
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._LoadingBlend
path:
classID: 23
script: {fileID: 0}
flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
Assets/Model/CardModelWrapper/Ani_ShowFaceDownCard.anim.meta 0 → 100644
View file @ 08b6b630
fileFormatVersion: 2
guid: a9aefb2eec36dc54c8884b612fdd47c1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Model/CardModelWrapper/CardModelFront.mat
View file @ 08b6b630
...@@ -21,7 +21,7 @@ Material: ...@@ -21,7 +21,7 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: CardModelFront m_Name: CardModelFront
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} m_Shader: {fileID: 4800000, guid: 2427aecdda49f0c42b34931e1128f253, type: 3}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: [] m_ValidKeywords: []
...@@ -29,9 +29,8 @@ Material: ...@@ -29,9 +29,8 @@ Material:
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000 m_CustomRenderQueue: -1
stringTagMap: stringTagMap: {}
RenderType: Opaque
disabledShaderPasses: disabledShaderPasses:
- MOTIONVECTORS - MOTIONVECTORS
m_LockedProperties: m_LockedProperties:
...@@ -62,6 +61,10 @@ Material: ...@@ -62,6 +61,10 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _LoadingTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
...@@ -82,6 +85,10 @@ Material: ...@@ -82,6 +85,10 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _Texture2DAsset_90c6e35ef4304f289c279037152a03b7_Out_0:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps: - unity_Lightmaps:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
...@@ -108,13 +115,17 @@ Material: ...@@ -108,13 +115,17 @@ Material:
- _Cutoff: 0.5 - _Cutoff: 0.5
- _DetailAlbedoMapScale: 1 - _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
- _DirectionalLightAmp: 0.88
- _DstBlend: 0 - _DstBlend: 0
- _DstBlendAlpha: 0 - _DstBlendAlpha: 0
- _EnvironmentReflections: 1 - _EnvironmentReflections: 1
- _FakeBlend: 0
- _GlossMapScale: 0 - _GlossMapScale: 0
- _Glossiness: 0 - _Glossiness: 0
- _GlossyReflections: 0 - _GlossyReflections: 0
- _LoadingBlend: 0
- _Metallic: 0 - _Metallic: 0
- _Monochrome: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.005 - _Parallax: 0.005
- _QueueOffset: 0 - _QueueOffset: 0
...@@ -125,13 +136,25 @@ Material: ...@@ -125,13 +136,25 @@ Material:
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1
- _SrcBlendAlpha: 1 - _SrcBlendAlpha: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _Surface: 0 - _Surface: 0
- _WorkflowMode: 1 - _WorkflowMode: 1
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _AddColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
- _AmbientColor: {r: 0.1019608, g: 0.1019608, b: 0.1019608, a: 1}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {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} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _FakeLightColor: {r: 1, g: 0, b: 0, a: 1}
- _FakeLightDirection: {r: 0, g: 0, b: 0, a: 0}
- _FakeNormalDirection: {r: 0, g: 0, b: 0, a: 0}
- _FakeViewDirection: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
m_AllowLocking: 1 m_AllowLocking: 1
Assets/Model/CardModelWrapper/Shader Graph EX_NormalStyle.shader 0 → 100644
View file @ 08b6b630
Shader "Shader Graph EX/NormalStyle" {
Properties {
[Enum(Off, 0, On, 1)] _ZWrite ("ZWrite", Float) = 0
_StencilComp ("Stencil Comparison", Float) = 8
_Stencil ("Stencil ID", Float) = 0
_StencilOp ("Stencil Operation", Float) = 0
_StencilWriteMask ("Stencil Write Mask", Float) = 255
_StencilReadMask ("Stencil Read Mask", Float) = 255
[NoScaleOffset] _MainTex ("MainTex", 2D) = "white" {}
[NoScaleOffset] _LoadingTex ("LoadingTex", 2D) = "white" {}
_LoadingBlend ("LoadingBlend", Range(0, 1)) = 0
_AmbientColor ("AmbientColor", Vector) = (0.1019608,0.1019608,0.1019608,1)
_AddColor ("AddColor", Vector) = (0.5019608,0.5019608,0.5019608,1)
_Monochrome ("Monochrome", Range(0, 1)) = 0
_DirectionalLightAmp ("DirectionalLightAmp", Float) = 0.88
_FakeLightColor ("FakeLightColor", Vector) = (1,0,0,1)
_FakeLightDirection ("FakeLightDirection", Vector) = (0,0,0,0)
_FakeViewDirection ("FakeViewDirection", Vector) = (0,0,0,0)
_FakeNormalDirection ("FakeNormalDirection", Vector) = (0,0,0,0)
_FakeBlend ("FakeBlend", Range(0, 1)) = 0
_TintColor ("TintColor", Vector) = (1,1,1,1)
[NoScaleOffset] _Texture2DAsset_90c6e35ef4304f289c279037152a03b7_Out_0 ("Texture2D", 2D) = "white" {}
[HideInInspector] [NoScaleOffset] unity_Lightmaps ("unity_Lightmaps", 2DArray) = "" {}
[HideInInspector] [NoScaleOffset] unity_LightmapsInd ("unity_LightmapsInd", 2DArray) = "" {}
[HideInInspector] [NoScaleOffset] unity_ShadowMasks ("unity_ShadowMasks", 2DArray) = "" {}
}
//DummyShaderTextExporter
SubShader{
Tags { "RenderType"="Opaque" }
LOD 200
CGPROGRAM
#pragma surface surf Standard
#pragma target 3.0
sampler2D _MainTex;
struct Input
{
float2 uv_MainTex;
};
void surf(Input IN, inout SurfaceOutputStandard o)
{
fixed4 c = tex2D(_MainTex, IN.uv_MainTex);
o.Albedo = c.rgb;
o.Alpha = c.a;
}
ENDCG
}
Fallback "Hidden/Shader Graph/FallbackError"
}
\ No newline at end of file
Assets/Model/CardModelWrapper/Shader Graph EX_NormalStyle.shader.meta 0 → 100644
View file @ 08b6b630
fileFormatVersion: 2
guid: 2427aecdda49f0c42b34931e1128f253
timeCreated: 1702942545
licenseType: Free
ShaderImporter:
externalObjects: {}
defaultTextures: []
nonModifiableTextures: []
preprocessorOverride: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/ScriptableObjects/DuelPrefabs/CardModelWrapper.prefab
View file @ 08b6b630
...@@ -11,6 +11,7 @@ GameObject: ...@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 4216810836007714} - component: {fileID: 4216810836007714}
- component: {fileID: 33271670417289313} - component: {fileID: 33271670417289313}
- component: {fileID: 23697446437450159} - component: {fileID: 23697446437450159}
- component: {fileID: 3450115560024832950}
m_Layer: 0 m_Layer: 0
m_Name: CardModel_front m_Name: CardModel_front
m_TagString: Untagged m_TagString: Untagged
...@@ -64,7 +65,7 @@ MeshRenderer: ...@@ -64,7 +65,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 0} - {fileID: 2100000, guid: 437009a8f76bfae4d804411764122e71, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
...@@ -86,6 +87,28 @@ MeshRenderer: ...@@ -86,6 +87,28 @@ MeshRenderer:
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0} m_AdditionalVertexStreams: {fileID: 0}
--- !u!95 &3450115560024832950
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1023785417745517}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: c68f8f49b3abe8d41ac5189cadfd0371, type: 2}
m_CullingMode: 0
m_UpdateMode: 2
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &1064130517098276 --- !u!1 &1064130517098276
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Assets/Scripts/MDPro3/Duel/GameCard.cs
View file @ 08b6b630
...@@ -318,7 +318,6 @@ namespace MDPro3 ...@@ -318,7 +318,6 @@ namespace MDPro3
} }
} }
public Card GetData() public Card GetData()
{ {
return data; return data;
...@@ -335,15 +334,18 @@ namespace MDPro3 ...@@ -335,15 +334,18 @@ namespace MDPro3
} }
public void SetData(Card d) public void SetData(Card d)
{
if(d.Id != data.Id)
{ {
data = d; data = d;
if (model != null) if (model != null)
{ {
if (data.Id > 0) if (data.Id > 0)
StartCoroutine(SetFace()); StartCoroutine(SetFace());
RefreshLabel();
} }
if(d.Id > 0) }
RefreshLabel();
if (d.Id > 0)
if ((p.location & (uint)CardLocation.Extra) > 0) if ((p.location & (uint)CardLocation.Extra) > 0)
if ((p.position & (uint)CardPosition.FaceUp) > 0) if ((p.position & (uint)CardPosition.FaceUp) > 0)
if (p.sequence == Program.I().ocgcore.GetLocationCardCount(CardLocation.Extra, p.controller) - 1) if (p.sequence == Program.I().ocgcore.GetLocationCardCount(CardLocation.Extra, p.controller) - 1)
...@@ -942,6 +944,7 @@ namespace MDPro3 ...@@ -942,6 +944,7 @@ namespace MDPro3
{ {
CreateModel(); CreateModel();
ModelAt(p); ModelAt(p);
ShowFaceDownCardOrNot(NeedShowFaceDownCard());
} }
return 0; return 0;
} }
...@@ -1334,6 +1337,7 @@ namespace MDPro3 ...@@ -1334,6 +1337,7 @@ namespace MDPro3
if((p.location & (uint)CardLocation.Extra) > 0 if((p.location & (uint)CardLocation.Extra) > 0
&& (cacheP.location & (uint)CardLocation.Extra) == 0) && (cacheP.location & (uint)CardLocation.Extra) == 0)
Program.I().ocgcore.SetDeckTop(this); Program.I().ocgcore.SetDeckTop(this);
ShowFaceDownCardOrNot(NeedShowFaceDownCard());
}); });
SummonPass: SummonPass:
...@@ -1854,6 +1858,7 @@ namespace MDPro3 ...@@ -1854,6 +1858,7 @@ namespace MDPro3
sequence.Append(offset.DOLocalMove(new Vector3(0, 2, 3), 0.1f).OnStart(() => sequence.Append(offset.DOLocalMove(new Vector3(0, 2, 3), 0.1f).OnStart(() =>
{ {
model.SetActive(true); model.SetActive(true);
ShowFaceDownCardOrNot(false);
AudioManager.PlaySE("SE_CARDVIEW_02"); AudioManager.PlaySE("SE_CARDVIEW_02");
Program.I().ocgcore.description.Show(this, null); Program.I().ocgcore.description.Show(this, null);
})); }));
...@@ -1881,6 +1886,7 @@ namespace MDPro3 ...@@ -1881,6 +1886,7 @@ namespace MDPro3
Destroy(model); Destroy(model);
}); });
} }
ShowFaceDownCardOrNot(NeedShowFaceDownCard());
}); });
} }
public void AnimationPositon(float delay = 0) public void AnimationPositon(float delay = 0)
...@@ -2670,10 +2676,13 @@ namespace MDPro3 ...@@ -2670,10 +2676,13 @@ namespace MDPro3
labelRoot.DOScale(1, 0.2f).SetEase(Ease.InCubic); labelRoot.DOScale(1, 0.2f).SetEase(Ease.InCubic);
if (NeedShowCloseup()) if (NeedShowCloseup())
{ {
var renderer = manager.GetElement<MeshRenderer>("Closeup");
if(renderer.material.mainTexture == null)
closeupShowing = false;
if (!closeupShowing) if (!closeupShowing)
{ {
closeupShowing = true; closeupShowing = true;
StartCoroutine(Program.I().texture_.LoadCloseupAsync(data.Id, manager.GetElement<MeshRenderer>("Closeup"))); StartCoroutine(Program.I().texture_.LoadCloseupAsync(data.Id, renderer));
} }
} }
else else
...@@ -2780,6 +2789,48 @@ namespace MDPro3 ...@@ -2780,6 +2789,48 @@ namespace MDPro3
return false; return false;
return true; return true;
} }
public bool NeedShowFaceDownCard()
{
if(data.Id == 0)
return false;
if((p.position & (uint)CardPosition.FaceUp) > 0)
return false;
if((p.location & (uint)CardLocation.Onfield) == 0)
return false;
return true;
}
public void ShowFaceDownCardOrNot(bool show)
{
if (model == null)
return;
var back = manager.GetElement<Transform>("CardModel").GetChild(0).GetComponent<Renderer>();
var face = manager.GetElement<Transform>("CardModel").GetChild(1).GetComponent<Renderer>();
if (Program.I().ocgcore.condition == OcgCore.Condition.Duel && !Config.GetBool("DuelFaceDown", true))
show = false;
if (Program.I().ocgcore.condition == OcgCore.Condition.Watch && !Config.GetBool("WatchFaceDown", true))
show = false;
if (Program.I().ocgcore.condition == OcgCore.Condition.Replay && !Config.GetBool("ReplayFaceDown", true))
show = false;
if (show)
{
face.GetComponent<Animator>().SetBool("Show", true);
face.transform.localEulerAngles = new Vector3(180f, 0f, 0f);
face.material.SetTexture("_LoadingTex", back.material.mainTexture);
back.gameObject.SetActive(false);
}
else
{
back.gameObject.SetActive(true);
face.GetComponent<Animator>().SetBool("Show", false);
face.transform.localEulerAngles = new Vector3(180f, 0f, -180f);
}
}
#endregion #endregion
#region CardCounter #region CardCounter
......
Assets/Scripts/MDPro3/Helper/Config.cs
View file @ 08b6b630
...@@ -14,6 +14,9 @@ namespace MDPro3 ...@@ -14,6 +14,9 @@ namespace MDPro3
private static string path; private static string path;
public readonly static string stringYes = "1";
public readonly static string stringNo = "0";
public static void Initialize(string path) public static void Initialize(string path)
{ {
Config.path = path; Config.path = path;
...@@ -50,25 +53,6 @@ namespace MDPro3 ...@@ -50,25 +53,6 @@ namespace MDPro3
} }
} }
public static float GetFloat(string v, float defaul)
{
var getted = 0;
try
{
getted = int.Parse(Get(v, (defaul * 1000).ToString()));
}
catch (Exception)
{
}
return getted / 1000f;
}
public static void SetFloat(string v, float f)
{
Set(v, ((int)(f * 1000f)).ToString());
}
public static bool Have(string original) public static bool Have(string original)
{ {
var found = false; var found = false;
...@@ -126,6 +110,35 @@ namespace MDPro3 ...@@ -126,6 +110,35 @@ namespace MDPro3
translations.Add(s); translations.Add(s);
} }
} }
public static float GetFloat(string v, float defau)
{
var getted = 0;
try
{
getted = int.Parse(Get(v, (defau * 1000).ToString()));
}
catch { }
return getted / 1000f;
}
public static void SetFloat(string v, float f)
{
Set(v, ((int)(f * 1000f)).ToString());
}
public static bool GetBool(string original, bool value)
{
try
{
value = Get(original, value ? stringYes : stringNo) == stringYes;
}
catch { }
return value;
}
public static void SetBool(string original, bool value)
{
Set(original, value ? stringYes : stringNo);
}
public static void Save() public static void Save()
{ {
var all = ""; var all = "";
......
Assets/Scripts/MDPro3/Servants/EditDeck.cs
View file @ 08b6b630
...@@ -360,9 +360,10 @@ namespace MDPro3 ...@@ -360,9 +360,10 @@ namespace MDPro3
} }
manager.GetElement("Group").SetActive(true); manager.GetElement("Group").SetActive(true);
cardShowing = data; cardShowing = data;
if (showingFace != null) //if (showingFace != null)
Destroy(showingFace); // Destroy(showingFace);
showingFace = Instantiate(cardFace); //showingFace = Instantiate(cardFace);
showingFace = cardFace;
manager.GetElement<RawImage>("Card").texture = showingFace; manager.GetElement<RawImage>("Card").texture = showingFace;
manager.GetElement<RawImage>("Card").material = mat; manager.GetElement<RawImage>("Card").material = mat;
manager.GetElement<Text>("TextName").text = data.Name; manager.GetElement<Text>("TextName").text = data.Name;
......
Assets/Scripts/MDPro3/Servants/OcgCore.cs
View file @ 08b6b630
...@@ -148,7 +148,6 @@ namespace MDPro3 ...@@ -148,7 +148,6 @@ namespace MDPro3
{ {
base.OnExit(); base.OnExit();
CloseConnection(); CloseConnection();
exitWithAcc = accing;
OnNor(); OnNor();
} }
...@@ -176,7 +175,6 @@ namespace MDPro3 ...@@ -176,7 +175,6 @@ namespace MDPro3
} }
public bool accing; public bool accing;
bool exitWithAcc;
public void OnAcc() public void OnAcc()
{ {
accing = true; accing = true;
...@@ -1323,7 +1321,9 @@ namespace MDPro3 ...@@ -1323,7 +1321,9 @@ namespace MDPro3
messagePass = true; messagePass = true;
yield return null; yield return null;
if (exitWithAcc) if (condition == Condition.Duel && Config.GetBool("DuelAutoAcc", false)
|| condition == Condition.Watch && Config.GetBool("WatchAutoAcc", false)
|| condition == Condition.Replay && Config.GetBool("ReplayAutoAcc", false))
OnAcc(); OnAcc();
DOTween.To(v => { }, 0, 0, UnityEngine.Random.Range(8, 16)).OnComplete(() => DOTween.To(v => { }, 0, 0, UnityEngine.Random.Range(8, 16)).OnComplete(() =>
...@@ -3156,6 +3156,7 @@ namespace MDPro3 ...@@ -3156,6 +3156,7 @@ namespace MDPro3
card = GCS_Get(from); card = GCS_Get(from);
if (card != null) if (card != null)
{ {
card.ShowFaceDownCardOrNot(false);
card.SetCode(code); card.SetCode(code);
sleep = card.Move(to); sleep = card.Move(to);
var delay = sleep; var delay = sleep;
......
Assets/Scripts/MDPro3/Servants/Setting.cs
View file @ 08b6b630
using DG.Tweening; using DG.Tweening;
using MDPro3.UI; using MDPro3.UI;
using NUnit.Framework.Constraints;
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using UnityEngine; using UnityEngine;
using UnityEngine.AddressableAssets; using UnityEngine.AddressableAssets;
using UnityEngine.Networking; using UnityEngine.Networking;
using UnityEngine.Rendering.Universal; using UnityEngine.Rendering.Universal;
using UnityEngine.UI; using UnityEngine.UI;
using YgomGame.WCS.Portal;
using ShadowResolution = UnityEngine.Rendering.Universal.ShadowResolution; using ShadowResolution = UnityEngine.Rendering.Universal.ShadowResolution;
namespace MDPro3 namespace MDPro3
...@@ -87,6 +86,11 @@ namespace MDPro3 ...@@ -87,6 +86,11 @@ namespace MDPro3
public Text duelSystemMessageValue; public Text duelSystemMessageValue;
public Slider duelAcc; public Slider duelAcc;
public Text duelAccValue; public Text duelAccValue;
public Button duelAutoAcc;
public Text duelAutoAccValue;
public Button duelFaceDown;
public Text duelFaceDownValue;
public Button timing; public Button timing;
public Text timingValue; public Text timingValue;
public Button autoRPS; public Button autoRPS;
...@@ -123,6 +127,10 @@ namespace MDPro3 ...@@ -123,6 +127,10 @@ namespace MDPro3
public Text watchSystemMessageValue; public Text watchSystemMessageValue;
public Slider watchAcc; public Slider watchAcc;
public Text watchAccValue; public Text watchAccValue;
public Button watchAutoAcc;
public Text watchAutoAccValue;
public Button watchFaceDown;
public Text watchFaceDownValue;
[Header("Replay")] [Header("Replay")]
public Button replayAppearance; public Button replayAppearance;
...@@ -155,6 +163,10 @@ namespace MDPro3 ...@@ -155,6 +163,10 @@ namespace MDPro3
public Text replaySystemMessageValue; public Text replaySystemMessageValue;
public Slider replayAcc; public Slider replayAcc;
public Text replayAccValue; public Text replayAccValue;
public Button replayAutoAcc;
public Text replayAutoAccValue;
public Button replayFaceDown;
public Text replayFaceDownValue;
[Header("Port")] [Header("Port")]
public Button import; public Button import;
...@@ -233,6 +245,9 @@ namespace MDPro3 ...@@ -233,6 +245,9 @@ namespace MDPro3
duelCoin.onClick.AddListener(OnDuelCoinClick); duelCoin.onClick.AddListener(OnDuelCoinClick);
watchCoin.onClick.AddListener(OnWatchCoinClick); watchCoin.onClick.AddListener(OnWatchCoinClick);
replayCoin.onClick.AddListener(OnReplayCoinClick); replayCoin.onClick.AddListener(OnReplayCoinClick);
duelAutoInfo.onClick.AddListener(OnDuelAutoInfoClick);
watchAutoInfo.onClick.AddListener(OnWatchAutoInfoClick);
replayAutoInfo.onClick.AddListener(OnReplayAutoInfoClick);
duelPlayerMessage.onClick.AddListener(OnDuelPlayerMessageClick); duelPlayerMessage.onClick.AddListener(OnDuelPlayerMessageClick);
watchPlayerMessage.onClick.AddListener(OnWatchPlayerMessageClick); watchPlayerMessage.onClick.AddListener(OnWatchPlayerMessageClick);
replayPlayerMessage.onClick.AddListener(OnReplayPlayerMessageClick); replayPlayerMessage.onClick.AddListener(OnReplayPlayerMessageClick);
...@@ -240,11 +255,15 @@ namespace MDPro3 ...@@ -240,11 +255,15 @@ namespace MDPro3
watchSystemMessage.onClick.AddListener(OnWatchSystemMessageClick); watchSystemMessage.onClick.AddListener(OnWatchSystemMessageClick);
replaySystemMessage.onClick.AddListener(OnReplaySystemMessageClick); replaySystemMessage.onClick.AddListener(OnReplaySystemMessageClick);
duelAcc.onValueChanged.AddListener(OnDuelAccChange); duelAcc.onValueChanged.AddListener(OnDuelAccChange);
watchAcc.onValueChanged.AddListener (OnWatchAccChange); watchAcc.onValueChanged.AddListener(OnWatchAccChange);
replayAcc.onValueChanged.AddListener(OnReplayAccChange); replayAcc.onValueChanged.AddListener(OnReplayAccChange);
duelAutoInfo.onClick.AddListener(OnDuelAutoInfoClick); duelAutoAcc.onClick.AddListener(OnDuelAutoAccClick);
watchAutoInfo.onClick.AddListener(OnWatchAutoInfoClick); watchAutoAcc.onClick.AddListener(OnWatchAutoAccClick);
replayAutoInfo.onClick.AddListener(OnReplayAutoInfoClick); replayAutoAcc.onClick.AddListener(OnReplayAutoAccClick);
duelFaceDown.onClick.AddListener(OnDuelFaceDownClick);
watchFaceDown.onClick.AddListener(OnWatchFaceDownClick);
replayFaceDown.onClick.AddListener(OnReplayFaceDownClick);
timing.onClick.AddListener(OnTimingClick); timing.onClick.AddListener(OnTimingClick);
import.onClick.AddListener(OnImport); import.onClick.AddListener(OnImport);
...@@ -262,7 +281,7 @@ namespace MDPro3 ...@@ -262,7 +281,7 @@ namespace MDPro3
OnSeVolChange(seVol.value); OnSeVolChange(seVol.value);
voiceVol.value = Config.GetFloat("VoiceVol", 0.7f); voiceVol.value = Config.GetFloat("VoiceVol", 0.7f);
OnVoiceVolChange(voiceVol.value); OnVoiceVolChange(voiceVol.value);
fps.value = Config.GetFloat("FPS", 60); fps.value = Config.GetFloat("FPS", 60f);
OnFpsChange(fps.value); OnFpsChange(fps.value);
var defau = 1f; var defau = 1f;
...@@ -384,26 +403,26 @@ namespace MDPro3 ...@@ -384,26 +403,26 @@ namespace MDPro3
Config.Set("DuelSystemMessage", SaveBool(duelSystemMessageValue.text)); Config.Set("DuelSystemMessage", SaveBool(duelSystemMessageValue.text));
Config.Set("WatchSystemMessage", SaveBool(watchSystemMessageValue.text)); Config.Set("WatchSystemMessage", SaveBool(watchSystemMessageValue.text));
Config.Set("ReplaySystemMessage", SaveBool(replaySystemMessageValue.text)); Config.Set("ReplaySystemMessage", SaveBool(replaySystemMessageValue.text));
Config.SetFloat("DuelAcc", duelAcc.value); Config.Set("DuelAutoAcc", SaveBool(duelAutoAccValue.text));
Config.SetFloat("WatchAcc", watchAcc.value); Config.Set("WatchAutoAcc", SaveBool(watchAutoAccValue.text));
Config.SetFloat("ReplayAcc", replayAcc.value); Config.Set("ReplayAutoAcc", SaveBool(replayAutoAccValue.text));
Config.Set("Timing", SaveBool(timingValue.text));
Config.Set("Timing", SaveBool(timingValue.text));
Config.Set("Expansions", SaveBool(supportExpansionsValue.text)); Config.Set("Expansions", SaveBool(supportExpansionsValue.text));
Config.Save(); Config.Save();
} }
public string SaveBool(string value) public string SaveBool(string value)
{ {
string returnValue = "0"; string returnValue = Config.stringNo;
if (value == InterString.Get("开")) if (value == InterString.Get("开"))
returnValue = "1"; returnValue = Config.stringYes;
if (value == InterString.Get("有")) if (value == InterString.Get("有"))
returnValue = "1"; returnValue = Config.stringYes;
if (value == InterString.Get("左")) if (value == InterString.Get("左"))
returnValue = "1"; returnValue = Config.stringYes;
if (value == InterString.Get("是")) if (value == InterString.Get("是"))
returnValue = "1"; returnValue = Config.stringYes;
return returnValue; return returnValue;
} }
public void OnBgmVolChange(float vol) public void OnBgmVolChange(float vol)
...@@ -569,8 +588,8 @@ namespace MDPro3 ...@@ -569,8 +588,8 @@ namespace MDPro3
} }
public void InitializeShowFPS() public void InitializeShowFPS()
{ {
string value = Config.Get("ShowFPS", "1"); var value = Config.GetBool("ShowFPS", true);
if (value == "1") if (value)
{ {
showFPSValue.text = InterString.Get("开"); showFPSValue.text = InterString.Get("开");
UIManager.ShowFPS(); UIManager.ShowFPS();
...@@ -847,23 +866,23 @@ namespace MDPro3 ...@@ -847,23 +866,23 @@ namespace MDPro3
public void InitializeConfirm() public void InitializeConfirm()
{ {
string value = Config.Get("Confirm", "1"); var value = Config.GetBool("Confirm", true);
if (value == "0") if (value)
confirmValue.text = InterString.Get("右");
else
confirmValue.text = InterString.Get("左"); confirmValue.text = InterString.Get("左");
else
confirmValue.text = InterString.Get("右");
} }
public void OnConfirmClicked() public void OnConfirmClicked()
{ {
if (confirmValue.text == InterString.Get("右")) if (confirmValue.text == InterString.Get("右"))
{ {
confirmValue.text = InterString.Get("左"); confirmValue.text = InterString.Get("左");
Config.Set("Confirm", "1"); Config.SetBool("Confirm", true);
} }
else else
{ {
confirmValue.text = InterString.Get("右"); confirmValue.text = InterString.Get("右");
Config.Set("Confirm", "0"); Config.SetBool("Confirm", false);
} }
} }
...@@ -872,12 +891,12 @@ namespace MDPro3 ...@@ -872,12 +891,12 @@ namespace MDPro3
if (autoRPSValue.text == InterString.Get("关")) if (autoRPSValue.text == InterString.Get("关"))
{ {
autoRPSValue.text = InterString.Get("开"); autoRPSValue.text = InterString.Get("开");
Config.Set("AutoRPS", "1"); Config.SetBool("AutoRPS", true);
} }
else else
{ {
autoRPSValue.text = InterString.Get("关"); autoRPSValue.text = InterString.Get("关");
Config.Set("AutoRPS", "0"); Config.SetBool("AutoRPS", false);
} }
} }
public void InitializeSwitches() public void InitializeSwitches()
...@@ -886,215 +905,247 @@ namespace MDPro3 ...@@ -886,215 +905,247 @@ namespace MDPro3
watchAppearanceValue.text = Config.Get("WatchPlayerName0", "@ui"); watchAppearanceValue.text = Config.Get("WatchPlayerName0", "@ui");
replayAppearanceValue.text = Config.Get("ReplayPlayerName0", "@ui"); replayAppearanceValue.text = Config.Get("ReplayPlayerName0", "@ui");
string value = Config.Get("DuelVoice", "0"); var value = Config.GetBool("DuelVoice", false);
if (value == "0") if (value)
duelVoiceValue.text = InterString.Get("关");
else
duelVoiceValue.text = InterString.Get("开"); duelVoiceValue.text = InterString.Get("开");
value = Config.Get("WatchVoice", "0");
if (value == "0")
watchVoiceValue.text = InterString.Get("关");
else else
duelVoiceValue.text = InterString.Get("关");
value = Config.GetBool("WatchVoice", false);
if (value)
watchVoiceValue.text = InterString.Get("开"); watchVoiceValue.text = InterString.Get("开");
value = Config.Get("ReplayVoice", "0");
if (value == "0")
replayVoiceValue.text = InterString.Get("关");
else else
watchVoiceValue.text = InterString.Get("关");
value = Config.GetBool("ReplayVoice", false);
if (value)
replayVoiceValue.text = InterString.Get("开"); replayVoiceValue.text = InterString.Get("开");
value = Config.Get("DuelCloseup", "1");
if (value == "0")
duelCloseupValue.text = InterString.Get("关");
else else
replayVoiceValue.text = InterString.Get("关");
value = Config.GetBool("DuelCloseup", true);
if (value)
duelCloseupValue.text = InterString.Get("开"); duelCloseupValue.text = InterString.Get("开");
value = Config.Get("WatchCloseup", "1");
if (value == "0")
watchCloseupValue.text = InterString.Get("关");
else else
duelCloseupValue.text = InterString.Get("关");
value = Config.GetBool("WatchCloseup", true);
if (value)
watchCloseupValue.text = InterString.Get("开"); watchCloseupValue.text = InterString.Get("开");
value = Config.Get("ReplayCloseup", "1");
if (value == "0")
replayCloseupValue.text = InterString.Get("关");
else else
watchCloseupValue.text = InterString.Get("关");
value = Config.GetBool("ReplayCloseup", true);
if (value)
replayCloseupValue.text = InterString.Get("开"); replayCloseupValue.text = InterString.Get("开");
value = Config.Get("DuelSummon", "1");
if (value == "0")
duelSummonValue.text = InterString.Get("关");
else else
replayCloseupValue.text = InterString.Get("关");
value = Config.GetBool("DuelSummon", true);
if (value)
duelSummonValue.text = InterString.Get("开"); duelSummonValue.text = InterString.Get("开");
value = Config.Get("WatchSummon", "1");
if (value == "0")
watchSummonValue.text = InterString.Get("关");
else else
duelSummonValue.text = InterString.Get("关");
value = Config.GetBool("WatchSummon", true);
if (value)
watchSummonValue.text = InterString.Get("开"); watchSummonValue.text = InterString.Get("开");
value = Config.Get("ReplaySummon", "1");
if (value == "0")
replaySummonValue.text = InterString.Get("关");
else else
watchSummonValue.text = InterString.Get("关");
value = Config.GetBool("ReplaySummon", true);
if (value)
replaySummonValue.text = InterString.Get("开"); replaySummonValue.text = InterString.Get("开");
value = Config.Get("DuelPendulum", "1");
if (value == "0")
duelPendulumValue.text = InterString.Get("关");
else else
replaySummonValue.text = InterString.Get("关");
value = Config.GetBool("DuelPendulum", true);
if (value)
duelPendulumValue.text = InterString.Get("开"); duelPendulumValue.text = InterString.Get("开");
value = Config.Get("WatchPendulum", "1");
if (value == "0")
watchPendulumValue.text = InterString.Get("关");
else else
duelPendulumValue.text = InterString.Get("关");
value = Config.GetBool("WatchPendulum", true);
if (value)
watchPendulumValue.text = InterString.Get("开"); watchPendulumValue.text = InterString.Get("开");
value = Config.Get("ReplayPendulum", "1");
if (value == "0")
replayPendulumValue.text = InterString.Get("关");
else else
watchPendulumValue.text = InterString.Get("关");
value = Config.GetBool("ReplayPendulum", true);
if (value)
replayPendulumValue.text = InterString.Get("开"); replayPendulumValue.text = InterString.Get("开");
value = Config.Get("DuelCutin", "1");
if (value == "0")
duelCutinValue.text = InterString.Get("关");
else else
replayPendulumValue.text = InterString.Get("关");
value = Config.GetBool("DuelCutin", true);
if (value)
duelCutinValue.text = InterString.Get("开"); duelCutinValue.text = InterString.Get("开");
value = Config.Get("WatchCutin", "1");
if (value == "0")
watchCutinValue.text = InterString.Get("关");
else else
duelCutinValue.text = InterString.Get("关");
value = Config.GetBool("WatchCutin", true);
if (value)
watchCutinValue.text = InterString.Get("开"); watchCutinValue.text = InterString.Get("开");
value = Config.Get("ReplayCutin", "1");
if (value == "0")
replayCutinValue.text = InterString.Get("关");
else else
watchCutinValue.text = InterString.Get("关");
value = Config.GetBool("ReplayCutin", true);
if (value)
replayCutinValue.text = InterString.Get("开"); replayCutinValue.text = InterString.Get("开");
value = Config.Get("DuelEffect", "1");
if (value == "0")
duelEffectValue.text = InterString.Get("关");
else else
replayCutinValue.text = InterString.Get("关");
value = Config.GetBool("DuelEffect", true);
if (value)
duelEffectValue.text = InterString.Get("开"); duelEffectValue.text = InterString.Get("开");
value = Config.Get("WatchEffect", "1");
if (value == "0")
watchEffectValue.text = InterString.Get("关");
else else
duelEffectValue.text = InterString.Get("关");
value = Config.GetBool("WatchEffect", true);
if (value)
watchEffectValue.text = InterString.Get("开"); watchEffectValue.text = InterString.Get("开");
value = Config.Get("ReplayEffect", "1");
if (value == "0")
replayEffectValue.text = InterString.Get("关");
else else
watchEffectValue.text = InterString.Get("关");
value = Config.GetBool("ReplayEffect", true);
if (value)
replayEffectValue.text = InterString.Get("开"); replayEffectValue.text = InterString.Get("开");
value = Config.Get("DuelChain", "1");
if (value == "0")
duelChainValue.text = InterString.Get("关");
else else
replayEffectValue.text = InterString.Get("关");
value = Config.GetBool("DuelChain", true);
if (value)
duelChainValue.text = InterString.Get("开"); duelChainValue.text = InterString.Get("开");
value = Config.Get("WatchChain", "1");
if (value == "0")
watchChainValue.text = InterString.Get("关");
else else
duelChainValue.text = InterString.Get("关");
value = Config.GetBool("WatchChain", true);
if (value)
watchChainValue.text = InterString.Get("开"); watchChainValue.text = InterString.Get("开");
value = Config.Get("ReplayChain", "1");
if (value == "0")
replayChainValue.text = InterString.Get("关");
else else
watchChainValue.text = InterString.Get("关");
value = Config.GetBool("ReplayChain", true);
if (value)
replayChainValue.text = InterString.Get("开"); replayChainValue.text = InterString.Get("开");
value = Config.Get("DuelDice", "1");
if (value == "0")
duelDiceValue.text = InterString.Get("关");
else else
replayChainValue.text = InterString.Get("关");
value = Config.GetBool("DuelDice", true);
if (value)
duelDiceValue.text = InterString.Get("开"); duelDiceValue.text = InterString.Get("开");
value = Config.Get("WatchDice", "1");
if (value == "0")
watchDiceValue.text = InterString.Get("关");
else else
duelDiceValue.text = InterString.Get("关");
value = Config.GetBool("WatchDice", true);
if (value)
watchDiceValue.text = InterString.Get("开"); watchDiceValue.text = InterString.Get("开");
value = Config.Get("ReplayDice", "1");
if (value == "0")
replayDiceValue.text = InterString.Get("关");
else else
watchDiceValue.text = InterString.Get("关");
value = Config.GetBool("ReplayDice", true);
if (value)
replayDiceValue.text = InterString.Get("开"); replayDiceValue.text = InterString.Get("开");
value = Config.Get("DuelCoin", "1");
if (value == "0")
duelCoinValue.text = InterString.Get("关");
else else
replayDiceValue.text = InterString.Get("关");
value = Config.GetBool("DuelCoin", true);
if (value)
duelCoinValue.text = InterString.Get("开"); duelCoinValue.text = InterString.Get("开");
value = Config.Get("WatchCoin", "1");
if (value == "0")
watchCoinValue.text = InterString.Get("关");
else else
duelCoinValue.text = InterString.Get("关");
value = Config.GetBool("WatchCoin", true);
if (value)
watchCoinValue.text = InterString.Get("开"); watchCoinValue.text = InterString.Get("开");
value = Config.Get("ReplayCoin", "1");
if (value == "0")
replayCoinValue.text = InterString.Get("关");
else else
watchCoinValue.text = InterString.Get("关");
value = Config.GetBool("ReplayCoin", true);
if (value)
replayCoinValue.text = InterString.Get("开"); replayCoinValue.text = InterString.Get("开");
value = Config.Get("DuelAutoInfo", "1");
if (value == "0")
duelAutoInfoValue.text = InterString.Get("关");
else else
replayCoinValue.text = InterString.Get("关");
value = Config.GetBool("DuelAutoInfo", true);
if (value)
duelAutoInfoValue.text = InterString.Get("开"); duelAutoInfoValue.text = InterString.Get("开");
value = Config.Get("WatchAutoInfo", "1");
if (value == "0")
watchAutoInfoValue.text = InterString.Get("关");
else else
duelAutoInfoValue.text = InterString.Get("关");
value = Config.GetBool("WatchAutoInfo", true);
if (value)
watchAutoInfoValue.text = InterString.Get("开"); watchAutoInfoValue.text = InterString.Get("开");
value = Config.Get("ReplayAutoInfo", "1");
if (value == "0")
replayAutoInfoValue.text = InterString.Get("关");
else else
watchAutoInfoValue.text = InterString.Get("关");
value = Config.GetBool("ReplayAutoInfo", true);
if (value)
replayAutoInfoValue.text = InterString.Get("开"); replayAutoInfoValue.text = InterString.Get("开");
value = Config.Get("DuelPlayerMessage", "1");
if (value == "0")
duelPlayerMessageValue.text = InterString.Get("关");
else else
replayAutoInfoValue.text = InterString.Get("关");
value = Config.GetBool("DuelPlayerMessage", true);
if (value)
duelPlayerMessageValue.text = InterString.Get("开"); duelPlayerMessageValue.text = InterString.Get("开");
value = Config.Get("WatchPlayerMessage", "1");
if (value == "0")
watchPlayerMessageValue.text = InterString.Get("关");
else else
duelPlayerMessageValue.text = InterString.Get("关");
value = Config.GetBool("WatchPlayerMessage", true);
if (value)
watchPlayerMessageValue.text = InterString.Get("开"); watchPlayerMessageValue.text = InterString.Get("开");
value = Config.Get("ReplayPlayerMessage", "1");
if (value == "0")
replayPlayerMessageValue.text = InterString.Get("关");
else else
watchPlayerMessageValue.text = InterString.Get("关");
value = Config.GetBool("ReplayPlayerMessage", true);
if (value)
replayPlayerMessageValue.text = InterString.Get("开"); replayPlayerMessageValue.text = InterString.Get("开");
else
replayPlayerMessageValue.text = InterString.Get("关");
value = Config.Get("DuelSystemMessage", "1"); value = Config.GetBool("DuelSystemMessage", true);
if (value == "0") if (value)
duelSystemMessageValue.text = InterString.Get("开");
else
duelSystemMessageValue.text = InterString.Get("关"); duelSystemMessageValue.text = InterString.Get("关");
value = Config.GetBool("WatchSystemMessage", true);
if (value)
watchSystemMessageValue.text = InterString.Get("开");
else else
duelSystemMessageValue.text = InterString.Get("开");
value = Config.Get("WatchSystemMessage", "1");
if (value == "0")
watchSystemMessageValue.text = InterString.Get("关"); watchSystemMessageValue.text = InterString.Get("关");
value = Config.GetBool("ReplaySystemMessage", true);
if (value)
replaySystemMessageValue.text = InterString.Get("开");
else else
watchSystemMessageValue.text = InterString.Get("开");
value = Config.Get("ReplaySystemMessage", "1");
if (value == "0")
replaySystemMessageValue.text = InterString.Get("关"); replaySystemMessageValue.text = InterString.Get("关");
value = Config.GetBool("DuelAutoAcc", false);
if (value)
duelAutoAccValue.text = InterString.Get("开");
else else
replaySystemMessageValue.text = InterString.Get("开"); duelAutoAccValue.text = InterString.Get("关");
value = Config.GetBool("WatchAutoAcc", false);
if (value)
watchAutoAccValue.text = InterString.Get("开");
else
watchAutoAccValue.text = InterString.Get("关");
value = Config.GetBool("ReplayAutoAcc", false);
if (value)
replayAutoAccValue.text = InterString.Get("开");
else
replayAutoAccValue.text = InterString.Get("关");
value = Config.Get("Timing", "0"); value = Config.GetBool("DuelFaceDown", true);
if (value == "0") if (value)
timingValue.text = InterString.Get("关"); duelFaceDownValue.text = InterString.Get("开");
else else
timingValue.text = InterString.Get("开"); duelFaceDownValue.text = InterString.Get("关");
value = Config.GetBool("WatchFaceDown", true);
if (value)
watchFaceDownValue.text = InterString.Get("开");
else
watchFaceDownValue.text = InterString.Get("关");
value = Config.GetBool("ReplayFaceDown", true);
if (value)
replayFaceDownValue.text = InterString.Get("开");
else
replayFaceDownValue.text = InterString.Get("关");
value = Config.Get("AutoRPS", "0"); value = Config.GetBool("Timing", true);
if (value == "0") if (value)
autoRPSValue.text = InterString.Get("关"); timingValue.text = InterString.Get("开");
else else
autoRPSValue.text = InterString.Get("开"); timingValue.text = InterString.Get("关");
value = Config.Get("Expansions", "1"); value = Config.GetBool("AutoRPS", false);
if (value == "0") if (value)
supportExpansionsValue.text = InterString.Get("否"); autoRPSValue.text = InterString.Get("开");
else else
autoRPSValue.text = InterString.Get("关");
value = Config.GetBool("Expansions", true);
if (value)
supportExpansionsValue.text = InterString.Get("是"); supportExpansionsValue.text = InterString.Get("是");
else
supportExpansionsValue.text = InterString.Get("否");
} }
public void OnDuelAppearcanceClick() public void OnDuelAppearcanceClick()
{ {
...@@ -1158,12 +1209,12 @@ namespace MDPro3 ...@@ -1158,12 +1209,12 @@ namespace MDPro3
if (duelCloseupValue.text == InterString.Get("开")) if (duelCloseupValue.text == InterString.Get("开"))
{ {
duelCloseupValue.text = InterString.Get("关"); duelCloseupValue.text = InterString.Get("关");
Config.Set("DuelCloseup", "0"); Config.SetBool("DuelCloseup", false);
} }
else else
{ {
duelCloseupValue.text = InterString.Get("开"); duelCloseupValue.text = InterString.Get("开");
Config.Set("DuelCloseup", "1"); Config.SetBool("DuelCloseup", true);
} }
Config.Save(); Config.Save();
Program.I().ocgcore.RefreshAllCardsLabel(); Program.I().ocgcore.RefreshAllCardsLabel();
...@@ -1173,12 +1224,12 @@ namespace MDPro3 ...@@ -1173,12 +1224,12 @@ namespace MDPro3
if (watchCloseupValue.text == InterString.Get("开")) if (watchCloseupValue.text == InterString.Get("开"))
{ {
watchCloseupValue.text = InterString.Get("关"); watchCloseupValue.text = InterString.Get("关");
Config.Set("WatchCloseup", "0"); Config.SetBool("WatchCloseup", false);
} }
else else
{ {
watchCloseupValue.text = InterString.Get("开"); watchCloseupValue.text = InterString.Get("开");
Config.Set("WatchCloseup", "1"); Config.SetBool("WatchCloseup", true);
} }
Config.Save(); Config.Save();
Program.I().ocgcore.RefreshAllCardsLabel(); Program.I().ocgcore.RefreshAllCardsLabel();
...@@ -1188,12 +1239,12 @@ namespace MDPro3 ...@@ -1188,12 +1239,12 @@ namespace MDPro3
if (replayCloseupValue.text == InterString.Get("开")) if (replayCloseupValue.text == InterString.Get("开"))
{ {
replayCloseupValue.text = InterString.Get("关"); replayCloseupValue.text = InterString.Get("关");
Config.Set("ReplayCloseup", "0"); Config.SetBool("ReplayCloseup", false);
} }
else else
{ {
replayCloseupValue.text = InterString.Get("开"); replayCloseupValue.text = InterString.Get("开");
Config.Set("ReplayCloseup", "1"); Config.SetBool("ReplayCloseup", true);
} }
Config.Save(); Config.Save();
Program.I().ocgcore.RefreshAllCardsLabel(); Program.I().ocgcore.RefreshAllCardsLabel();
...@@ -1412,11 +1463,6 @@ namespace MDPro3 ...@@ -1412,11 +1463,6 @@ namespace MDPro3
replaySystemMessageValue.text = InterString.Get("开"); replaySystemMessageValue.text = InterString.Get("开");
} }
public static float duelAccSpeed = 2f;
public static float watchAccSpeed = 2f;
public static float replayAccSpeed = 2f;
public void OnDuelAccChange(float value) public void OnDuelAccChange(float value)
{ {
string result = value.ToString(); string result = value.ToString();
...@@ -1450,6 +1496,74 @@ namespace MDPro3 ...@@ -1450,6 +1496,74 @@ namespace MDPro3
Program.I().ocgcore.OnAcc(); Program.I().ocgcore.OnAcc();
} }
public void OnDuelAutoAccClick()
{
if (duelAutoAccValue.text == InterString.Get("开"))
duelAutoAccValue.text = InterString.Get("关");
else
duelAutoAccValue.text = InterString.Get("开");
}
public void OnWatchAutoAccClick()
{
if (watchAutoAccValue.text == InterString.Get("开"))
watchAutoAccValue.text = InterString.Get("关");
else
watchAutoAccValue.text = InterString.Get("开");
}
public void OnReplayAutoAccClick()
{
if (replayAutoAccValue.text == InterString.Get("开"))
replayAutoAccValue.text = InterString.Get("关");
else
replayAutoAccValue.text = InterString.Get("开");
}
public void OnDuelFaceDownClick()
{
if (duelFaceDownValue.text == InterString.Get("开"))
{
duelFaceDownValue.text = InterString.Get("关");
Config.SetBool("DuelFaceDown", false);
}
else
{
duelFaceDownValue.text = InterString.Get("开");
Config.SetBool("DuelFaceDown", true);
}
foreach(var card in Program.I().ocgcore.cards)
card.ShowFaceDownCardOrNot(card.NeedShowFaceDownCard());
}
public void OnWatchFaceDownClick()
{
if (watchFaceDownValue.text == InterString.Get("开"))
{
watchFaceDownValue.text = InterString.Get("关");
Config.SetBool("WatchFaceDown", false);
}
else
{
watchFaceDownValue.text = InterString.Get("开");
Config.SetBool("WatchFaceDown", true);
}
foreach (var card in Program.I().ocgcore.cards)
card.ShowFaceDownCardOrNot(card.NeedShowFaceDownCard());
}
public void OnReplayFaceDownClick()
{
if (replayFaceDownValue.text == InterString.Get("开"))
{
replayFaceDownValue.text = InterString.Get("关");
Config.SetBool("ReplayFaceDown", false);
}
else
{
replayFaceDownValue.text = InterString.Get("开");
Config.SetBool("ReplayFaceDown", true);
}
foreach (var card in Program.I().ocgcore.cards)
card.ShowFaceDownCardOrNot(card.NeedShowFaceDownCard());
}
public void OnTimingClick() public void OnTimingClick()
{ {
if (timingValue.text == InterString.Get("开")) if (timingValue.text == InterString.Get("开"))
...@@ -1540,12 +1654,12 @@ namespace MDPro3 ...@@ -1540,12 +1654,12 @@ namespace MDPro3
if (supportExpansionsValue.text == InterString.Get("否")) if (supportExpansionsValue.text == InterString.Get("否"))
{ {
supportExpansionsValue.text = InterString.Get("是"); supportExpansionsValue.text = InterString.Get("是");
Config.Set("Expansions", "1"); Config.SetBool("Expansions", true);
} }
else else
{ {
supportExpansionsValue.text = InterString.Get("否"); supportExpansionsValue.text = InterString.Get("否");
Config.Set("Expansions", "0"); Config.SetBool("Expansions", false);
} }
Program.I().InitializeForDataChange(); Program.I().InitializeForDataChange();
} }
......
Data/locales/zh-CN/translation.conf
View file @ 08b6b630
...@@ -548,3 +548,12 @@ Off->Off ...@@ -548,3 +548,12 @@ Off->Off
当方英雄->当方英雄 当方英雄->当方英雄
检测到新版先行卡，请至 [游戏设置]-[扩展卡包]-[更新先行卡] 处进行更新。->检测到新版先行卡，请至 [游戏设置]-[扩展卡包]-[更新先行卡] 处进行更新。 检测到新版先行卡，请至 [游戏设置]-[扩展卡包]-[更新先行卡] 处进行更新。->检测到新版先行卡，请至 [游戏设置]-[扩展卡包]-[更新先行卡] 处进行更新。
攻击被无效->攻击被无效
自动加速->自动加速
决斗开始时自动进入加速状态->决斗开始时自动进入加速状态
显示盖卡->显示盖卡
决斗中显示已知盖卡->决斗中显示已知盖卡
观战开始时自动进入加速状态->观战开始时自动进入加速状态
观战中显示已知盖卡->观战中显示已知盖卡
回放开始时自动进入加速状态->回放开始时自动进入加速状态
回放中显示已知盖卡->回放中显示已知盖卡
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