Commit b5b6fdcd authored by SherryChaos's avatar SherryChaos

Super Polymerization effects

parent 030e609f
...@@ -100,6 +100,11 @@ MonoBehaviour: ...@@ -100,6 +100,11 @@ MonoBehaviour:
m_ReadOnly: 0 m_ReadOnly: 0
m_SerializedLabels: [] m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0 FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f83662780e180064881e9db6571729c4
m_Address: FOT-KafuTechnoStd-H Outline
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0 m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: e38330e9272b0a94a916f68bd5115c96, type: 2} m_Settings: {fileID: 11400000, guid: e38330e9272b0a94a916f68bd5115c96, type: 2}
m_SchemaSet: m_SchemaSet:
......
...@@ -35,11 +35,6 @@ MonoBehaviour: ...@@ -35,11 +35,6 @@ MonoBehaviour:
m_ReadOnly: 0 m_ReadOnly: 0
m_SerializedLabels: [] m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0 FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c7050f5f52d950d45ae58db46b0f3cc1
m_Address: TextCompare
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 6c2a363b3f65c99499c33654b3e5c03e - m_GUID: 6c2a363b3f65c99499c33654b3e5c03e
m_Address: UpdateContent m_Address: UpdateContent
m_ReadOnly: 0 m_ReadOnly: 0
......
This diff is collapsed.
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FOT-KafuTechnoStd-H Outline
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- UNDERLAY_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Cube:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FaceTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 4332206384943914628, guid: 6dac441707ef57a4d9063c19bfb51631, type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OutlineTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Ambient: 0.5
- _Bevel: 0.5
- _BevelClamp: 0
- _BevelOffset: 0
- _BevelRoundness: 0
- _BevelWidth: 0
- _BumpFace: 0
- _BumpOutline: 0
- _ColorMask: 15
- _CullMode: 0
- _Diffuse: 0.5
- _FaceDilate: 0.15
- _FaceUVSpeedX: 0
- _FaceUVSpeedY: 0
- _GlowInner: 0.05
- _GlowOffset: 0
- _GlowOuter: 0.05
- _GlowPower: 0.75
- _GradientScale: 10
- _LightAngle: 3.1416
- _MaskSoftnessX: 0
- _MaskSoftnessY: 0
- _OutlineSoftness: 0
- _OutlineUVSpeedX: 0
- _OutlineUVSpeedY: 0
- _OutlineWidth: 0.2
- _PerspectiveFilter: 0.875
- _Reflectivity: 10
- _ScaleRatioA: 0.9
- _ScaleRatioB: 0.59624994
- _ScaleRatioC: 0.59624994
- _ScaleX: 1
- _ScaleY: 1
- _ShaderFlags: 0
- _Sharpness: 0
- _SpecularPower: 2
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 1
- _StencilWriteMask: 0
- _TextureHeight: 1024
- _TextureWidth: 1024
- _UnderlayDilate: 0.3
- _UnderlayOffsetX: 0
- _UnderlayOffsetY: 0
- _UnderlaySoftness: 0.2
- _VertexOffsetX: 0
- _VertexOffsetY: 0
- _WeightBold: 0.75
- _WeightNormal: 0
m_Colors:
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
- _FaceColor: {r: 1, g: 1, b: 1, a: 1}
- _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
- _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
- _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
fileFormatVersion: 2 fileFormatVersion: 2
guid: c7050f5f52d950d45ae58db46b0f3cc1 guid: f83662780e180064881e9db6571729c4
TextScriptImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 2100000
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
...@@ -2,20 +2,25 @@ ...@@ -2,20 +2,25 @@
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 6 serializedVersion: 8
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
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: FOT-KafuTechnoStd-H Shadow m_Name: FOT-KafuTechnoStd-H Shadow
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
m_ShaderKeywords: UNDERLAY_ON m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- UNDERLAY_ON
m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: {} stringTagMap: {}
disabledShaderPasses: [] disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
...@@ -39,6 +44,7 @@ Material: ...@@ -39,6 +44,7 @@ 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}
m_Ints: []
m_Floats: m_Floats:
- _Ambient: 0.5 - _Ambient: 0.5
- _Bevel: 0.5 - _Bevel: 0.5
...@@ -51,7 +57,7 @@ Material: ...@@ -51,7 +57,7 @@ Material:
- _ColorMask: 15 - _ColorMask: 15
- _CullMode: 0 - _CullMode: 0
- _Diffuse: 0.5 - _Diffuse: 0.5
- _FaceDilate: 0 - _FaceDilate: 0.15
- _FaceUVSpeedX: 0 - _FaceUVSpeedX: 0
- _FaceUVSpeedY: 0 - _FaceUVSpeedY: 0
- _GlowInner: 0.05 - _GlowInner: 0.05
...@@ -65,12 +71,12 @@ Material: ...@@ -65,12 +71,12 @@ Material:
- _OutlineSoftness: 0 - _OutlineSoftness: 0
- _OutlineUVSpeedX: 0 - _OutlineUVSpeedX: 0
- _OutlineUVSpeedY: 0 - _OutlineUVSpeedY: 0
- _OutlineWidth: 0 - _OutlineWidth: 0.2
- _PerspectiveFilter: 0.875 - _PerspectiveFilter: 0.875
- _Reflectivity: 10 - _Reflectivity: 10
- _ScaleRatioA: 0.9 - _ScaleRatioA: 0.9
- _ScaleRatioB: 0.73125 - _ScaleRatioB: 0.59624994
- _ScaleRatioC: 0.73125 - _ScaleRatioC: 0.59624994
- _ScaleX: 1 - _ScaleX: 1
- _ScaleY: 1 - _ScaleY: 1
- _ShaderFlags: 0 - _ShaderFlags: 0
...@@ -103,3 +109,4 @@ Material: ...@@ -103,3 +109,4 @@ Material:
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 1} - _UnderlayColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
m_AllowLocking: 1
This diff is collapsed.
This diff is collapsed.
...@@ -28,9 +28,9 @@ RectTransform: ...@@ -28,9 +28,9 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 3558088328168674575} m_Father: {fileID: 3558088328168674575}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -104,10 +104,10 @@ RectTransform: ...@@ -104,10 +104,10 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 3558088328168674575} - {fileID: 3558088328168674575}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
...@@ -167,8 +167,7 @@ MonoBehaviour: ...@@ -167,8 +167,7 @@ MonoBehaviour:
face: {fileID: 3558088328168674568} face: {fileID: 3558088328168674568}
cardBack: {fileID: 3558088329506061487} cardBack: {fileID: 3558088329506061487}
levelIcon: {fileID: 3558088329500718195} levelIcon: {fileID: 3558088329500718195}
textWhite: {fileID: 3558088328490012363} textLevel: {fileID: 6217516516085589480}
textBlack: {fileID: 3558088328788977401}
chain: {fileID: 5740762175965669138} chain: {fileID: 5740762175965669138}
chainText: {fileID: 2063961866504054398} chainText: {fileID: 2063961866504054398}
target: {fileID: 3095821199796190676} target: {fileID: 3095821199796190676}
...@@ -202,16 +201,15 @@ RectTransform: ...@@ -202,16 +201,15 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 3558088329506061480} - {fileID: 3558088329506061480}
- {fileID: 3558088329500718194} - {fileID: 3558088329500718194}
- {fileID: 3558088328788977400}
- {fileID: 3558088328490012362} - {fileID: 3558088328490012362}
- {fileID: 8614957993474061159} - {fileID: 8614957993474061159}
- {fileID: 3868930805099595159} - {fileID: 3868930805099595159}
- {fileID: 3558088329431919812} - {fileID: 3558088329431919812}
m_Father: {fileID: 3558088327943693420} m_Father: {fileID: 3558088327943693420}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
...@@ -263,9 +261,9 @@ GameObject: ...@@ -263,9 +261,9 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 3558088328490012362} - component: {fileID: 3558088328490012362}
- component: {fileID: 3558088328490012404} - component: {fileID: 3558088328490012404}
- component: {fileID: 3558088328490012363} - component: {fileID: 6217516516085589480}
m_Layer: 5 m_Layer: 5
m_Name: TextWhite m_Name: Text Level
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
...@@ -281,14 +279,14 @@ RectTransform: ...@@ -281,14 +279,14 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 3558088328168674575} m_Father: {fileID: 3558088328168674575}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 30, y: 0} m_AnchoredPosition: {x: 30, y: 0}
m_SizeDelta: {x: 60, y: 30} m_SizeDelta: {x: 48, y: 30}
m_Pivot: {x: 0, y: 0} m_Pivot: {x: 0, y: 0}
--- !u!222 &3558088328490012404 --- !u!222 &3558088328490012404
CanvasRenderer: CanvasRenderer:
...@@ -298,7 +296,7 @@ CanvasRenderer: ...@@ -298,7 +296,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3558088328490012361} m_GameObject: {fileID: 3558088328490012361}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &3558088328490012363 --- !u!114 &6217516516085589480
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -307,7 +305,7 @@ MonoBehaviour: ...@@ -307,7 +305,7 @@ MonoBehaviour:
m_GameObject: {fileID: 3558088328490012361} m_GameObject: {fileID: 3558088328490012361}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
...@@ -318,99 +316,77 @@ MonoBehaviour: ...@@ -318,99 +316,77 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_FontData: m_text: 12
m_Font: {fileID: 12800000, guid: 13dfcaebd0379f74d95ebf9f11bebfd9, type: 3} m_isRightToLeft: 0
m_FontSize: 25 m_fontAsset: {fileID: 11400000, guid: 6dac441707ef57a4d9063c19bfb51631, type: 2}
m_FontStyle: 0 m_sharedMaterial: {fileID: 2100000, guid: f83662780e180064881e9db6571729c4, type: 2}
m_BestFit: 0 m_fontSharedMaterials: []
m_MinSize: 2 m_fontMaterial: {fileID: 0}
m_MaxSize: 40 m_fontMaterials: []
m_Alignment: 3 m_fontColor32:
m_AlignByGeometry: 1 serializedVersion: 2
m_RichText: 1 rgba: 4294967295
m_HorizontalOverflow: 0 m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_VerticalOverflow: 0 m_enableVertexGradient: 0
m_LineSpacing: 1 m_colorMode: 3
m_Text: 12 m_fontColorGradient:
--- !u!1 &3558088328788977407 topLeft: {r: 1, g: 1, b: 1, a: 1}
GameObject: topRight: {r: 1, g: 1, b: 1, a: 1}
m_ObjectHideFlags: 0 bottomLeft: {r: 1, g: 1, b: 1, a: 1}
m_CorrespondingSourceObject: {fileID: 0} bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_PrefabInstance: {fileID: 0} m_fontColorGradientPreset: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_spriteAsset: {fileID: 0}
serializedVersion: 6 m_tintAllSprites: 0
m_Component: m_StyleSheet: {fileID: 0}
- component: {fileID: 3558088328788977400} m_TextStyleHashCode: -1183493901
- component: {fileID: 3558088328788977402} m_overrideHtmlColors: 0
- component: {fileID: 3558088328788977401} m_faceColor:
m_Layer: 5 serializedVersion: 2
m_Name: TextBlack rgba: 4294967295
m_TagString: Untagged m_fontSize: 25
m_Icon: {fileID: 0} m_fontSizeBase: 25
m_NavMeshLayer: 0 m_fontWeight: 400
m_StaticEditorFlags: 0 m_enableAutoSizing: 1
m_IsActive: 1 m_fontSizeMin: 18
--- !u!224 &3558088328788977400 m_fontSizeMax: 25
RectTransform: m_fontStyle: 0
m_ObjectHideFlags: 0 m_HorizontalAlignment: 1
m_CorrespondingSourceObject: {fileID: 0} m_VerticalAlignment: 512
m_PrefabInstance: {fileID: 0} m_textAlignment: 65535
m_PrefabAsset: {fileID: 0} m_characterSpacing: 0
m_GameObject: {fileID: 3558088328788977407} m_wordSpacing: 0
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_lineSpacing: 0
m_LocalPosition: {x: 0, y: 0, z: 0} m_lineSpacingMax: 0
m_LocalScale: {x: 1, y: 1, z: 1} m_paragraphSpacing: 0
m_Children: [] m_charWidthMaxAdj: 0
m_Father: {fileID: 3558088328168674575} m_TextWrappingMode: 1
m_RootOrder: 2 m_wordWrappingRatios: 0.4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_overflowMode: 0
m_AnchorMin: {x: 0, y: 0} m_linkedTextComponent: {fileID: 0}
m_AnchorMax: {x: 0, y: 0} parentLinkedComponent: {fileID: 0}
m_AnchoredPosition: {x: 33, y: -3} m_enableKerning: 0
m_SizeDelta: {x: 60, y: 30} m_ActiveFontFeatures: 6e72656b
m_Pivot: {x: 0, y: 0} m_enableExtraPadding: 0
--- !u!222 &3558088328788977402 checkPaddingRequired: 0
CanvasRenderer: m_isRichText: 1
m_ObjectHideFlags: 0 m_EmojiFallbackSupport: 1
m_CorrespondingSourceObject: {fileID: 0} m_parseCtrlCharacters: 1
m_PrefabInstance: {fileID: 0} m_isOrthographic: 1
m_PrefabAsset: {fileID: 0} m_isCullingEnabled: 0
m_GameObject: {fileID: 3558088328788977407} m_horizontalMapping: 0
m_CullTransparentMesh: 1 m_verticalMapping: 0
--- !u!114 &3558088328788977401 m_uvLineOffset: 0
MonoBehaviour: m_geometrySortingOrder: 0
m_ObjectHideFlags: 0 m_IsTextObjectScaleStatic: 0
m_CorrespondingSourceObject: {fileID: 0} m_VertexBufferAutoSizeReduction: 0
m_PrefabInstance: {fileID: 0} m_useMaxVisibleDescender: 1
m_PrefabAsset: {fileID: 0} m_pageToDisplay: 1
m_GameObject: {fileID: 3558088328788977407} m_margin: {x: 0, y: 0, z: 0, w: 0}
m_Enabled: 1 m_isUsingLegacyAnimationComponent: 0
m_EditorHideFlags: 0 m_isVolumetricText: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_hasFontAssetChanged: 0
m_Name: m_baseMaterial: {fileID: 0}
m_EditorClassIdentifier: m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 13dfcaebd0379f74d95ebf9f11bebfd9, type: 3}
m_FontSize: 25
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 1
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 12
--- !u!1 &3558088329431919835 --- !u!1 &3558088329431919835
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -440,9 +416,9 @@ RectTransform: ...@@ -440,9 +416,9 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 3558088328168674575} m_Father: {fileID: 3558088328168674575}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
...@@ -559,9 +535,9 @@ RectTransform: ...@@ -559,9 +535,9 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 3558088328168674575} m_Father: {fileID: 3558088328168674575}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
...@@ -634,9 +610,9 @@ RectTransform: ...@@ -634,9 +610,9 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 3558088328168674575} m_Father: {fileID: 3558088328168674575}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
...@@ -709,10 +685,10 @@ RectTransform: ...@@ -709,10 +685,10 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 2243596853973833867} - {fileID: 2243596853973833867}
m_Father: {fileID: 3558088328168674575} m_Father: {fileID: 3558088328168674575}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -785,9 +761,9 @@ RectTransform: ...@@ -785,9 +761,9 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 8614957993474061159} m_Father: {fileID: 8614957993474061159}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
......
...@@ -152,6 +152,25 @@ namespace MDPro3 ...@@ -152,6 +152,25 @@ namespace MDPro3
var raceSprite = GetCardRace(data); var raceSprite = GetCardRace(data);
manager.GetElement<Image>("Race").sprite = raceSprite.sprite; manager.GetElement<Image>("Race").sprite = raceSprite.sprite;
manager.GetElement("RaceOutline").SetActive(raceSprite.notOriginal); manager.GetElement("RaceOutline").SetActive(raceSprite.notOriginal);
bool isTuner = false;
if ((data.Type & (uint)CardType.Tuner) > 0)
{
isTuner = true;
manager.GetElement("Tuner").SetActive(true);
}
else
manager.GetElement("Tuner").SetActive(false);
if(isTuner)
{
if ((origin.Type & (uint)CardType.Tuner) > 0)
manager.GetElement("TunerOutline").SetActive(false);
else
manager.GetElement("TunerOutline").SetActive(true);
}
else
manager.GetElement("TunerOutline").SetActive(false);
manager.GetElement<Image>("Level").sprite = TextureManager.GetCardLevelIcon(data); manager.GetElement<Image>("Level").sprite = TextureManager.GetCardLevelIcon(data);
if ((data.Type & (uint)CardType.Link) > 0) if ((data.Type & (uint)CardType.Link) > 0)
{ {
......
...@@ -74,6 +74,7 @@ namespace MDPro3 ...@@ -74,6 +74,7 @@ namespace MDPro3
var statusRect = manager.GetElement<RectTransform>("Status"); var statusRect = manager.GetElement<RectTransform>("Status");
var effectRect = manager.GetElement<RectTransform>("Effect"); var effectRect = manager.GetElement<RectTransform>("Effect");
if ((origin.Type & (uint)CardType.Monster) > 0) if ((origin.Type & (uint)CardType.Monster) > 0)
{ {
statusRect.sizeDelta = new Vector2(statusRect.sizeDelta.x, 140); statusRect.sizeDelta = new Vector2(statusRect.sizeDelta.x, 140);
...@@ -81,6 +82,10 @@ namespace MDPro3 ...@@ -81,6 +82,10 @@ namespace MDPro3
manager.GetElement("StatusSpell").SetActive(false); manager.GetElement("StatusSpell").SetActive(false);
manager.GetElement<Image>("Level").sprite = TextureManager.GetCardLevelIcon(origin); manager.GetElement<Image>("Level").sprite = TextureManager.GetCardLevelIcon(origin);
manager.GetElement<Image>("Race").sprite = TextureManager.GetCardRaceIcon(origin.Race); manager.GetElement<Image>("Race").sprite = TextureManager.GetCardRaceIcon(origin.Race);
if ((origin.Type & (uint)CardType.Tuner) > 0)
manager.GetElement("Tuner").SetActive(true);
else
manager.GetElement("Tuner").SetActive(false);
manager.GetElement<Text>("TextATK").text = origin.Attack == -2 ? "?" : origin.Attack.ToString(); manager.GetElement<Text>("TextATK").text = origin.Attack == -2 ? "?" : origin.Attack.ToString();
if ((origin.Type & (uint)CardType.Link) > 0) if ((origin.Type & (uint)CardType.Link) > 0)
{ {
......
...@@ -3,6 +3,7 @@ using System.Collections.Generic; ...@@ -3,6 +3,7 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using MDPro3.YGOSharp.OCGWrapper.Enums; using MDPro3.YGOSharp.OCGWrapper.Enums;
using TMPro;
namespace MDPro3.UI namespace MDPro3.UI
{ {
...@@ -11,8 +12,7 @@ namespace MDPro3.UI ...@@ -11,8 +12,7 @@ namespace MDPro3.UI
public RawImage face; public RawImage face;
public GameObject cardBack; public GameObject cardBack;
public Image levelIcon; public Image levelIcon;
public Text textWhite; public TextMeshProUGUI textLevel;
public Text textBlack;
public GameObject chain; public GameObject chain;
public Text chainText; public Text chainText;
public GameObject target; public GameObject target;
...@@ -32,16 +32,14 @@ namespace MDPro3.UI ...@@ -32,16 +32,14 @@ namespace MDPro3.UI
{ {
levelIcon.sprite = TextureManager.GetCardLevelIcon(card.GetData()); levelIcon.sprite = TextureManager.GetCardLevelIcon(card.GetData());
if ((card.GetData().Type & (uint)CardType.Link) > 0) if ((card.GetData().Type & (uint)CardType.Link) > 0)
textWhite.text = CardDescription.GetCardLinkCount(card.GetData()).ToString(); textLevel.text = CardDescription.GetCardLinkCount(card.GetData()).ToString();
else else
textWhite.text = card.GetData().Level.ToString(); textLevel.text = card.GetData().Level.ToString();
textBlack.text = textWhite.text;
} }
else else
{ {
levelIcon.sprite = TextureManager.container.typeNone; levelIcon.sprite = TextureManager.container.typeNone;
textWhite.text = ""; textLevel.text = "";
textBlack.text = "";
} }
if (card.chains.Count > 0) if (card.chains.Count > 0)
{ {
...@@ -65,8 +63,7 @@ namespace MDPro3.UI ...@@ -65,8 +63,7 @@ namespace MDPro3.UI
else else
{ {
levelIcon.gameObject.SetActive(false); levelIcon.gameObject.SetActive(false);
textWhite.text = ""; textLevel.text = "";
textBlack.text = "";
chain.SetActive(false); chain.SetActive(false);
cardBack.SetActive(false); cardBack.SetActive(false);
} }
......
...@@ -2829,6 +2829,8 @@ namespace MDPro3 ...@@ -2829,6 +2829,8 @@ namespace MDPro3
return; return;
if (IsFaceDownOnSpellZone()) if (IsFaceDownOnSpellZone())
setTurn = Program.I().ocgcore.turns; setTurn = Program.I().ocgcore.turns;
else
setTurn = 0;
var back = manager.GetElement<Transform>("CardModel").GetChild(0).GetComponent<Renderer>(); var back = manager.GetElement<Transform>("CardModel").GetChild(0).GetComponent<Renderer>();
var face = manager.GetElement<Transform>("CardModel").GetChild(1).GetComponent<Renderer>(); var face = manager.GetElement<Transform>("CardModel").GetChild(1).GetComponent<Renderer>();
......
...@@ -11,7 +11,7 @@ using MDPro3.UI; ...@@ -11,7 +11,7 @@ using MDPro3.UI;
namespace MDPro3 namespace MDPro3
{ {
public class TimeLineManager : Manager public class TimelineManager : Manager
{ {
public static ElementObjectManager currentManager; public static ElementObjectManager currentManager;
public static ElementObjectManager currentSyncManager; public static ElementObjectManager currentSyncManager;
...@@ -79,16 +79,34 @@ namespace MDPro3 ...@@ -79,16 +79,34 @@ namespace MDPro3
SyncSummonTimeline(); SyncSummonTimeline();
GameObject ms; GameObject ms;
if (materials.Count > 8)
ms = ABLoader.LoadFromFolder("MasterDuel/Timeline/summon/summonfusion/summonfusionshowunitcard08", //Super Polymerization
"summonfusionshowunitcard08", true); var data = Program.I().ocgcore.summonCard.GetData();
if ((data.Type & (uint)CardType.Fusion) > 0
&& Program.I().ocgcore.currentSolvingCard != null
&& Program.I().ocgcore.currentSolvingCard.GetData().Id == 48130397)
{
if (materials.Count > 8)
ms = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/SummonFusion07445ShowUnitCard08",
"SummonFusion07445ShowUnitCard08", true);
else
ms = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/SummonFusion07445ShowUnitCard0" + materials.Count,
"SummonFusion07445ShowUnitCard0" + materials.Count, true);
}
else else
ms = ABLoader.LoadFromFolder("MasterDuel/Timeline/summon/summonfusion/summonfusionshowunitcard0" + materials.Count, {
"summonfusionshowunitcard0" + materials.Count, true); if (materials.Count > 8)
ms = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/SummonFusionShowUnitCard08",
"SummonFusionShowUnitCard08", true);
else
ms = ABLoader.LoadFromFolder("MasterDuel/Timeline/Summon/SummonFusion/summonfusionshowunitcard0" + materials.Count,
"SummonFusionShowUnitCard0" + materials.Count, true);
}
Program.I().ocgcore.allGameObjects.Add(ms); Program.I().ocgcore.allGameObjects.Add(ms);
var manager = ms.transform.GetChild(0).GetComponent<ElementObjectManager>(); var manager = Tools.GetPlayableDirectorInChildren(ms.transform).GetComponent<ElementObjectManager>();
manager.GetComponent<PlayableDirector>().playOnAwake = true;
currentManager = manager; currentManager = manager;
bool tunerFound = false; bool tunerFound = false;
......
...@@ -24,7 +24,7 @@ namespace MDPro3 ...@@ -24,7 +24,7 @@ namespace MDPro3
public AudioManager audio_; public AudioManager audio_;
public TextureManager texture_; public TextureManager texture_;
public MessageManager message_; public MessageManager message_;
public TimeLineManager timeline_; public TimelineManager timeline_;
[Header("Servants")] [Header("Servants")]
public Menu menu; public Menu menu;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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