diff --git a/LevelDesign/UnityPackageManager/manifest.json b/LevelDesign/UnityPackageManager/manifest.json new file mode 100644 index 0000000..526aca6 --- /dev/null +++ b/LevelDesign/UnityPackageManager/manifest.json @@ -0,0 +1,4 @@ +{ + "dependencies": { + } +} diff --git a/ProgrammerTeam20181024/Assets/New Sprite Atlas.spriteatlas b/ProgrammerTeam20181024/Assets/New Sprite Atlas.spriteatlas new file mode 100644 index 0000000..979e64f --- /dev/null +++ b/ProgrammerTeam20181024/Assets/New Sprite Atlas.spriteatlas @@ -0,0 +1,58 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!687078895 &4343727234628468602 +SpriteAtlas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: New Sprite Atlas + m_EditorData: + serializedVersion: 2 + textureSettings: + serializedVersion: 2 + anisoLevel: 1 + compressionQuality: 50 + maxTextureSize: 2048 + textureCompression: 0 + filterMode: 1 + generateMipMaps: 0 + readable: 0 + crunchedCompression: 0 + sRGB: 1 + platformSettings: [] + packingSettings: + serializedVersion: 2 + padding: 4 + blockOffset: 1 + allowAlphaSplitting: 0 + enableRotation: 1 + enableTightPacking: 1 + variantMultiplier: 1 + packables: + - {fileID: 2800000, guid: 09e5124442bb3d6459034aa7d953ddd7, type: 3} + - {fileID: 21300000, guid: e066b9463aa07014291f3f26b078ab17, type: 3} + - {fileID: 21300002, guid: e066b9463aa07014291f3f26b078ab17, type: 3} + - {fileID: 21300004, guid: e066b9463aa07014291f3f26b078ab17, type: 3} + - {fileID: 21300006, guid: e066b9463aa07014291f3f26b078ab17, type: 3} + - {fileID: 21300008, guid: e066b9463aa07014291f3f26b078ab17, type: 3} + - {fileID: 21300010, guid: e066b9463aa07014291f3f26b078ab17, type: 3} + bindAsDefault: 1 + m_MasterAtlas: {fileID: 0} + m_PackedSprites: + - {fileID: 21300000, guid: 09e5124442bb3d6459034aa7d953ddd7, type: 3} + - {fileID: 21300000, guid: e066b9463aa07014291f3f26b078ab17, type: 3} + - {fileID: 21300002, guid: e066b9463aa07014291f3f26b078ab17, type: 3} + - {fileID: 21300004, guid: e066b9463aa07014291f3f26b078ab17, type: 3} + - {fileID: 21300006, guid: e066b9463aa07014291f3f26b078ab17, type: 3} + - {fileID: 21300008, guid: e066b9463aa07014291f3f26b078ab17, type: 3} + - {fileID: 21300010, guid: e066b9463aa07014291f3f26b078ab17, type: 3} + m_PackedSpriteNamesToIndex: + - base + - sample_0 + - sample_1 + - sample_2 + - sample_3 + - sample_4 + - sample_5 + m_Tag: New Sprite Atlas + m_IsVariant: 0 diff --git a/ProgrammerTeam20181024/Assets/New Sprite Atlas.spriteatlas.meta b/ProgrammerTeam20181024/Assets/New Sprite Atlas.spriteatlas.meta new file mode 100644 index 0000000..76e09c1 --- /dev/null +++ b/ProgrammerTeam20181024/Assets/New Sprite Atlas.spriteatlas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b220629c941971f4c81768d61b04f3bf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4343727234628468602 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProgrammerTeam20181024/Assets/Scenes/SampleScene.unity b/ProgrammerTeam20181024/Assets/Scenes/SampleScene.unity index e5cd674..c90df89 100644 --- a/ProgrammerTeam20181024/Assets/Scenes/SampleScene.unity +++ b/ProgrammerTeam20181024/Assets/Scenes/SampleScene.unity @@ -113,90 +113,67 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &70946227 +--- !u!1 &33394282 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 70946231} - - component: {fileID: 70946230} - - component: {fileID: 70946229} - - component: {fileID: 70946228} + - component: {fileID: 33394285} + - component: {fileID: 33394284} + - component: {fileID: 33394283} m_Layer: 0 - m_Name: Cube + m_Name: EventSystem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!65 &70946228 -BoxCollider: +--- !u!114 &33394283 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 70946227} - m_Material: {fileID: 0} - m_IsTrigger: 0 + m_GameObject: {fileID: 33394282} m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &70946229 -MeshRenderer: + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &33394284 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 70946227} + m_GameObject: {fileID: 33394282} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &70946230 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 70946227} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &70946231 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &33394285 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 70946227} + m_GameObject: {fileID: 33394282} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &170076733 GameObject: @@ -296,8 +273,8 @@ Camera: m_GameObject: {fileID: 534669902} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} @@ -341,3 +318,430 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &645408712 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 645408713} + - component: {fileID: 645408715} + - component: {fileID: 645408714} + m_Layer: 5 + m_Name: base + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &645408713 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 645408712} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2067487280} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -10.4, y: 176.73} + m_SizeDelta: {x: 194.9, y: 321.46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &645408714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 645408712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 09e5124442bb3d6459034aa7d953ddd7, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &645408715 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 645408712} + m_CullTransparentMesh: 0 +--- !u!1 &1049879414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1049879415} + - component: {fileID: 1049879417} + - component: {fileID: 1049879416} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1049879415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1049879414} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1860274629} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -2.5} + m_SizeDelta: {x: -20, y: -5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1049879416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1049879414} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +--- !u!222 &1049879417 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1049879414} + m_CullTransparentMesh: 0 +--- !u!1 &1257975372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1257975375} + - component: {fileID: 1257975374} + - component: {fileID: 1257975373} + m_Layer: 5 + m_Name: face + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1257975373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1257975372} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: e066b9463aa07014291f3f26b078ab17, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1257975374 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1257975372} + m_CullTransparentMesh: 0 +--- !u!224 &1257975375 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1257975372} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.12, y: 1.1, z: 1} + m_Children: [] + m_Father: {fileID: 2067487280} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -11.8, y: 48.7} + m_SizeDelta: {x: 100, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1710319585 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1710319587} + - component: {fileID: 1710319586} + m_Layer: 0 + m_Name: Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1710319586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1710319585} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 20af10c573cb2f84db568b40f5a332b9, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 1049879416} + msg: + - "\u885D\u6483\u306E\u30D5\u30A1\u30FC\u30B9\u30C8\u30D6\u30EA\u30C3\u30C8" + - "\u6483\u6EC5\u306E\u30BB\u30AB\u30F3\u30C9\u30D6\u30EA\u30C3\u30C8" + - "\u62B9\u6BBA\u306E\u30E9\u30B9\u30C8\u30D6\u30EA\u30C3\u30C8" + body: {fileID: 645408714} + face: {fileID: 1257975373} + atlas: {fileID: 4343727234628468602, guid: b220629c941971f4c81768d61b04f3bf, type: 2} +--- !u!4 &1710319587 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1710319585} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1860274628 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1860274629} + - component: {fileID: 1860274631} + - component: {fileID: 1860274630} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1860274629 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1860274628} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1049879415} + m_Father: {fileID: 2067487280} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 39.5} + m_SizeDelta: {x: 0, y: 79} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1860274630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1860274628} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1860274631 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1860274628} + m_CullTransparentMesh: 0 +--- !u!1 &2067487276 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2067487280} + - component: {fileID: 2067487279} + - component: {fileID: 2067487278} + - component: {fileID: 2067487277} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2067487277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2067487276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &2067487278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2067487276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &2067487279 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2067487276} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &2067487280 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2067487276} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 645408713} + - {fileID: 1257975375} + - {fileID: 1860274629} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} diff --git a/ProgrammerTeam20181024/Assets/SendingText.cs b/ProgrammerTeam20181024/Assets/SendingText.cs new file mode 100644 index 0000000..9831dbf --- /dev/null +++ b/ProgrammerTeam20181024/Assets/SendingText.cs @@ -0,0 +1,56 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.U2D; + +public class SendingText : MonoBehaviour +{ + + [SerializeField] private Text text; + [SerializeField] private List msg; + private List.Enumerator enumerator; + + [SerializeField] Image body, face; + + [SerializeField] SpriteAtlas atlas; + + + IEnumerator Start() + { + //body.sprite = atlas.GetSprite( "base" ); + + enumerator = msg.GetEnumerator(); + + yield return StartCoroutine( "OnClick" ); + yield return null; + + yield return StartCoroutine( "OnClick" ); + yield return null; + + yield return StartCoroutine( "OnClick" ); + yield return null; + } + + public IEnumerator OnClick() + { + if ( !enumerator.MoveNext() ) + { + yield break; + } + + text.text = ""; + + face.sprite = atlas.GetSprite( "sample_4" ); + foreach ( char item in enumerator.Current ) + { + face.gameObject.SetActive( true ); + text.text += item; + yield return new WaitForSeconds( 0.075f ); + face.gameObject.SetActive( false ); + yield return new WaitForSeconds( 0.025f ); + } + + yield return new WaitUntil( () => Input.GetMouseButtonDown( 0 ) ); + } +} diff --git a/ProgrammerTeam20181024/Assets/SendingText.cs.meta b/ProgrammerTeam20181024/Assets/SendingText.cs.meta new file mode 100644 index 0000000..2f118b6 --- /dev/null +++ b/ProgrammerTeam20181024/Assets/SendingText.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 20af10c573cb2f84db568b40f5a332b9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProgrammerTeam20181024/Assets/base.jpg b/ProgrammerTeam20181024/Assets/base.jpg new file mode 100644 index 0000000..2faaac8 Binary files /dev/null and b/ProgrammerTeam20181024/Assets/base.jpg differ diff --git a/ProgrammerTeam20181024/Assets/base.jpg.meta b/ProgrammerTeam20181024/Assets/base.jpg.meta new file mode 100644 index 0000000..b1165a4 --- /dev/null +++ b/ProgrammerTeam20181024/Assets/base.jpg.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 09e5124442bb3d6459034aa7d953ddd7 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProgrammerTeam20181024/Assets/sample.jpg b/ProgrammerTeam20181024/Assets/sample.jpg new file mode 100644 index 0000000..b87028f Binary files /dev/null and b/ProgrammerTeam20181024/Assets/sample.jpg differ diff --git a/ProgrammerTeam20181024/Assets/sample.jpg.meta b/ProgrammerTeam20181024/Assets/sample.jpg.meta new file mode 100644 index 0000000..d261543 --- /dev/null +++ b/ProgrammerTeam20181024/Assets/sample.jpg.meta @@ -0,0 +1,236 @@ +fileFormatVersion: 2 +guid: e066b9463aa07014291f3f26b078ab17 +TextureImporter: + fileIDToRecycleName: + 21300000: sample_0 + 21300002: sample_1 + 21300004: sample_2 + 21300006: sample_3 + 21300008: sample_4 + 21300010: sample_5 + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: sample_0 + rect: + serializedVersion: 2 + x: 173 + y: 298 + width: 100 + height: 90 + alignment: 9 + pivot: {x: 0.8687507, y: 0.2976441} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a021339964799aa479a8674824556256 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sample_1 + rect: + serializedVersion: 2 + x: 282 + y: 300 + width: 100 + height: 90 + alignment: 9 + pivot: {x: 0.85686505, y: 0.2999531} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 906d5592b9a58e3458ba88e7edd5a523 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sample_2 + rect: + serializedVersion: 2 + x: 393 + y: 299 + width: 100 + height: 90 + alignment: 9 + pivot: {x: 0.863498, y: 0.30008867} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ac69078bccbb8df43947bd667a089bd3 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sample_3 + rect: + serializedVersion: 2 + x: 505 + y: 298 + width: 100 + height: 90 + alignment: 9 + pivot: {x: 0.8513878, y: 0.30116853} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1ce6ec87e2d6d8f489a976dfd5b05cad + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sample_4 + rect: + serializedVersion: 2 + x: 179 + y: 200 + width: 100 + height: 90 + alignment: 9 + pivot: {x: 0.86558634, y: 0.3043492} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f7d4b7e3a836757488952d9920bb0dfa + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: sample_5 + rect: + serializedVersion: 2 + x: 289 + y: 200 + width: 100 + height: 90 + alignment: 9 + pivot: {x: 0.86195236, y: 0.29595554} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3513628b329d90048812b27b5fc86187 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5d13f7d72a041084392d9e1179d1cf37 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProgrammerTeam20181024/ProjectSettings/EditorSettings.asset b/ProgrammerTeam20181024/ProjectSettings/EditorSettings.asset index 29dea52..9b57720 100644 --- a/ProgrammerTeam20181024/ProjectSettings/EditorSettings.asset +++ b/ProgrammerTeam20181024/ProjectSettings/EditorSettings.asset @@ -8,7 +8,7 @@ EditorSettings: m_SerializationMode: 2 m_LineEndingsForNewScripts: 2 m_DefaultBehaviorMode: 0 - m_SpritePackerMode: 0 + m_SpritePackerMode: 3 m_SpritePackerPaddingPower: 1 m_EtcTextureCompressorBehavior: 1 m_EtcTextureFastCompressor: 1 @@ -19,3 +19,4 @@ EditorSettings: m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_EnableTextureStreamingInPlayMode: 1 diff --git a/ProgrammerTeam20181024/ProjectSettings/ProjectVersion.txt b/ProgrammerTeam20181024/ProjectSettings/ProjectVersion.txt index 6a40dc6..064c3ce 100644 --- a/ProgrammerTeam20181024/ProjectSettings/ProjectVersion.txt +++ b/ProgrammerTeam20181024/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.2.9f1 +m_EditorVersion: 2018.2.20f1