mbunch_kascope 6 meses atrás
pai
commit
4a3d23b1ee

+ 29 - 2
Assets/Prefab/YesNoObject.prefab

@@ -48,6 +48,7 @@ GameObject:
   m_Component:
   - component: {fileID: 9087878232752822907}
   - component: {fileID: 6754228367933223943}
+  - component: {fileID: 860432446521144979}
   - component: {fileID: 4608105844449142102}
   m_Layer: 8
   m_Name: Window002_BlueTitle
@@ -88,6 +89,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 389817155771020265}
   m_CullTransparentMesh: 0
+--- !u!114 &860432446521144979
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 389817155771020265}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &4608105844449142102
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -692,7 +705,7 @@ RectTransform:
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!95 &3751631643572900190
 Animator:
-  serializedVersion: 4
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -709,7 +722,8 @@ Animator:
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!114 &3751631643572900162
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1258,6 +1272,7 @@ GameObject:
   - component: {fileID: 1555779862118152829}
   - component: {fileID: 2218845355730495835}
   - component: {fileID: 3909343950701462315}
+  - component: {fileID: 1393932544902825481}
   - component: {fileID: 5896306082600215633}
   m_Layer: 8
   m_Name: Window002_Blue_Opaque
@@ -1344,6 +1359,18 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 5, y: 5}
   m_UseGraphicAlpha: 1
+--- !u!114 &1393932544902825481
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7437543865522074446}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &5896306082600215633
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 91 - 65
Assets/Scenes/BattleScene.unity

@@ -21164,6 +21164,7 @@ GameObject:
   - component: {fileID: 236944701}
   - component: {fileID: 236944700}
   - component: {fileID: 236944699}
+  - component: {fileID: 236944703}
   m_Layer: 5
   m_Name: ReturnButton
   m_TagString: Untagged
@@ -21315,6 +21316,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 236944697}
   m_CullTransparentMesh: 0
+--- !u!114 &236944703
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 236944697}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &241382779
 GameObject:
   m_ObjectHideFlags: 0
@@ -42115,6 +42128,7 @@ GameObject:
   - component: {fileID: 498630158}
   - component: {fileID: 498630157}
   - component: {fileID: 498630156}
+  - component: {fileID: 498630160}
   m_Layer: 5
   m_Name: "\u5834\u3092\u78BA\u8A8D\u30DC\u30BF\u30F3"
   m_TagString: Untagged
@@ -42266,6 +42280,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 498630154}
   m_CullTransparentMesh: 0
+--- !u!114 &498630160
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498630154}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &498633399
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -64989,7 +65015,6 @@ GameObject:
   - component: {fileID: 850265626}
   - component: {fileID: 850265625}
   - component: {fileID: 850265624}
-  - component: {fileID: 850265627}
   m_Layer: 5
   m_Name: Window001_BlueTitle
   m_TagString: Untagged
@@ -65118,18 +65143,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 850265622}
   m_CullTransparentMesh: 0
---- !u!114 &850265627
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 850265622}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &853217212 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7674907443243730683, guid: 162aa550510be60439dc5e05d805f283, type: 3}
@@ -71379,6 +71392,7 @@ GameObject:
   - component: {fileID: 975879111}
   - component: {fileID: 975879110}
   - component: {fileID: 975879109}
+  - component: {fileID: 975879113}
   m_Layer: 5
   m_Name: NotSelectButton
   m_TagString: Untagged
@@ -71530,6 +71544,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 975879107}
   m_CullTransparentMesh: 0
+--- !u!114 &975879113
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 975879107}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &976427735
 GameObject:
   m_ObjectHideFlags: 0
@@ -119619,6 +119645,7 @@ GameObject:
   - component: {fileID: 1434232865}
   - component: {fileID: 1434232864}
   - component: {fileID: 1434232863}
+  - component: {fileID: 1434232867}
   m_Layer: 5
   m_Name: NotSelectButton
   m_TagString: Untagged
@@ -119770,6 +119797,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1434232861}
   m_CullTransparentMesh: 0
+--- !u!114 &1434232867
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1434232861}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1434870861
 GameObject:
   m_ObjectHideFlags: 0
@@ -145616,6 +145655,7 @@ GameObject:
   - component: {fileID: 1620120239}
   - component: {fileID: 1620120238}
   - component: {fileID: 1620120237}
+  - component: {fileID: 1620120241}
   m_Layer: 5
   m_Name: ReturnButton
   m_TagString: Untagged
@@ -145767,6 +145807,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1620120235}
   m_CullTransparentMesh: 0
+--- !u!114 &1620120241
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1620120235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1621258402
 GameObject:
   m_ObjectHideFlags: 0
@@ -159345,7 +159397,6 @@ GameObject:
   - component: {fileID: 1888414108}
   - component: {fileID: 1888414107}
   - component: {fileID: 1888414106}
-  - component: {fileID: 1888414109}
   m_Layer: 5
   m_Name: Window001_Blue_Opaque
   m_TagString: Untagged
@@ -159474,18 +159525,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1888414104}
   m_CullTransparentMesh: 0
---- !u!114 &1888414109
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1888414104}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1888516389
 GameObject:
   m_ObjectHideFlags: 0
@@ -162256,6 +162295,7 @@ GameObject:
   - component: {fileID: 1933968625}
   - component: {fileID: 1933968624}
   - component: {fileID: 1933968623}
+  - component: {fileID: 1933968627}
   m_Layer: 8
   m_Name: Window002_Blue_Opaque
   m_TagString: Untagged
@@ -162401,6 +162441,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1933968621}
   m_CullTransparentMesh: 0
+--- !u!114 &1933968627
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1933968621}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1934703435
 GameObject:
   m_ObjectHideFlags: 0
@@ -163166,6 +163218,7 @@ GameObject:
   - component: {fileID: 1951620861}
   - component: {fileID: 1951620860}
   - component: {fileID: 1951620859}
+  - component: {fileID: 1951620863}
   m_Layer: 5
   m_Name: "\u5834\u3092\u78BA\u8A8D\u30DC\u30BF\u30F3"
   m_TagString: Untagged
@@ -163317,6 +163370,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1951620857}
   m_CullTransparentMesh: 0
+--- !u!114 &1951620863
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1951620857}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1952172996
 GameObject:
   m_ObjectHideFlags: 0
@@ -174922,7 +174987,6 @@ GameObject:
   - component: {fileID: 5918122520792414977}
   - component: {fileID: 7949587185277551902}
   - component: {fileID: 8200926122536285532}
-  - component: {fileID: 8200926122536285533}
   m_Layer: 5
   m_Name: Background
   m_TagString: Untagged
@@ -175472,7 +175536,6 @@ GameObject:
   - component: {fileID: 3866827094933513033}
   - component: {fileID: 3866827094933513032}
   - component: {fileID: 3866827094933513036}
-  - component: {fileID: 3866827094933513037}
   m_Layer: 5
   m_Name: Window001_BlueTitle
   m_TagString: Untagged
@@ -175563,18 +175626,6 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
---- !u!114 &3866827094933513037
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3866827094933513034}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!222 &3901541707692704400
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -197653,7 +197704,6 @@ GameObject:
   - component: {fileID: 5323875035375742492}
   - component: {fileID: 2999994543648881556}
   - component: {fileID: 7923767337218471966}
-  - component: {fileID: 7923767337218471967}
   m_Layer: 5
   m_Name: Window001_Blue_Opaque
   m_TagString: Untagged
@@ -197722,18 +197772,6 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
---- !u!114 &7923767337218471967
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7923767337218471965}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!224 &7941285543054982175
 RectTransform:
   m_ObjectHideFlags: 0
@@ -197929,18 +197967,6 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
---- !u!114 &8200926122536285533
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3693723300019823637}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &8278914228708852320
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 105 - 92
Assets/Scenes/Opening.unity

@@ -60215,97 +60215,6 @@ MonoBehaviour:
   _fontSize_JPN: -1
   _text_ENG: Sound Volume
   _text_JPN: "\u30B5\u30A6\u30F3\u30C9\u97F3\u91CF\u8A2D\u5B9A"
---- !u!21 &1459748696
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Shapes2D Material
-  m_Shader: {fileID: 4800000, guid: 44f74e30da9814584b2fdcdbe799e51a, type: 3}
-  m_ValidKeywords:
-  - FILL_SOLID_COLOR
-  - RECTANGLE
-  m_InvalidKeywords:
-  - _EMISSION
-  m_LightmapFlags: 1
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Shapes2D_DstAlpha: 1
-    - _Shapes2D_DstBlend: 10
-    - _Shapes2D_SrcAlpha: 1
-    - _Shapes2D_SrcBlend: 1
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []
 --- !u!1 &1461475375
 GameObject:
   m_ObjectHideFlags: 0
@@ -68728,6 +68637,7 @@ GameObject:
   - component: {fileID: 1673908282}
   - component: {fileID: 1673908281}
   - component: {fileID: 1673908280}
+  - component: {fileID: 1673908283}
   m_Layer: 5
   m_Name: Window001_White
   m_TagString: Untagged
@@ -68861,6 +68771,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1673908278}
   m_CullTransparentMesh: 0
+--- !u!114 &1673908283
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1673908278}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1677538007
 GameObject:
   m_ObjectHideFlags: 0
@@ -85605,6 +85527,97 @@ RectTransform:
   m_AnchoredPosition: {x: -342.7, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!21 &2005667441
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Shapes2D Material
+  m_Shader: {fileID: 4800000, guid: 44f74e30da9814584b2fdcdbe799e51a, type: 3}
+  m_ValidKeywords:
+  - FILL_SOLID_COLOR
+  - RECTANGLE
+  m_InvalidKeywords:
+  - _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Shapes2D_DstAlpha: 1
+    - _Shapes2D_DstBlend: 10
+    - _Shapes2D_SrcAlpha: 1
+    - _Shapes2D_SrcBlend: 1
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
 --- !u!224 &2013581092 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6122313008728822826, guid: e358e77ca0e59034894b27870d5d0b04, type: 3}
@@ -108484,7 +108497,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 1459748696}
+  m_Material: {fileID: 2005667441}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}

+ 1 - 1
Assets/Scripts

@@ -1 +1 @@
-Subproject commit a225e3a1c441c94d73a0f7819a7f219a16fd47af
+Subproject commit 2a068152de7f92048729e2e344cb972a6cea0908