diff --git a/Assets/BitmapFontImporter/Examples/Font1/font1.fontsettings b/Assets/BitmapFontImporter/Examples/Font1/font1.fontsettings index 98cfd83..6153ca9 100644 --- a/Assets/BitmapFontImporter/Examples/Font1/font1.fontsettings +++ b/Assets/BitmapFontImporter/Examples/Font1/font1.fontsettings @@ -1,8 +1,8 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!21 &2125084 +--- !u!21 &2148722 Material: - serializedVersion: 6 + serializedVersion: 5 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} @@ -11,7 +11,6 @@ Material: m_ShaderKeywords: m_LightmapFlags: 5 m_CustomRenderQueue: -1 - stringTagMap: {} m_SavedProperties: serializedVersion: 2 m_TexEnvs: @@ -47,10 +46,6 @@ Material: first: name: _ColorMask second: 15 - data: - first: - name: _UseUIAlphaClip - second: 0 m_Colors: data: first: @@ -64,1004 +59,1004 @@ Font: m_Name: font1 serializedVersion: 4 m_AsciiStartOffset: 0 - m_Tracking: 1 + m_Kerning: 1 m_LineSpacing: 80 m_CharacterSpacing: 1 m_CharacterPadding: 0 m_ConvertCase: 0 - m_DefaultMaterial: {fileID: 2125084} + m_DefaultMaterial: {fileID: 2148722} m_CharacterRects: - serializedVersion: 2 index: 97 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.9160156 - width: 0.109792285 - height: 0.080078125 + x: .00593471806 + y: .916015625 + width: .109792285 + height: .080078125 vert: serializedVersion: 2 x: 3 y: -14 width: 37 height: -41 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 98 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.8046875 - width: 0.10385757 - height: 0.107421875 + x: .00593471806 + y: .8046875 + width: .103857569 + height: .107421875 vert: serializedVersion: 2 x: 5 y: -1 width: 35 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 99 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.7207031 - width: 0.10385757 - height: 0.080078125 + x: .00593471806 + y: .720703125 + width: .103857569 + height: .080078125 vert: serializedVersion: 2 x: 3 y: -14 width: 35 height: -41 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 100 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.609375 - width: 0.10385757 - height: 0.107421875 + x: .00593471806 + y: .609375 + width: .103857569 + height: .107421875 vert: serializedVersion: 2 x: 2 y: -1 width: 35 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 101 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.5253906 - width: 0.109792285 - height: 0.080078125 + x: .00593471806 + y: .525390625 + width: .109792285 + height: .080078125 vert: serializedVersion: 2 x: 3 y: -14 width: 37 height: -41 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 102 uv: serializedVersion: 2 - x: 0.115727 - y: 0.8046875 - width: 0.07121662 - height: 0.107421875 + x: .115727 + y: .8046875 + width: .0712166205 + height: .107421875 vert: serializedVersion: 2 x: 1 - y: 0 + y: -0 width: 24 height: -55 - advance: 20 + width: 20 flipped: 0 - serializedVersion: 2 index: 103 uv: serializedVersion: 2 - x: 0.115727 - y: 0.69140625 - width: 0.10385757 - height: 0.109375 + x: .115727 + y: .69140625 + width: .103857569 + height: .109375 vert: serializedVersion: 2 x: 2 y: -14 width: 35 height: -56 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 104 uv: serializedVersion: 2 - x: 0.19287834 - y: 0.890625 - width: 0.09792283 - height: 0.10546875 + x: .192878336 + y: .890625 + width: .0979228467 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 33 height: -54 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 105 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.41601562 - width: 0.023738872 - height: 0.10546875 + x: .00593471806 + y: .416015625 + width: .0237388723 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 8 height: -54 - advance: 16 + width: 16 flipped: 0 - serializedVersion: 2 index: 106 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.27734375 - width: 0.050445102 - height: 0.13476562 + x: .00593471806 + y: .27734375 + width: .0504451022 + height: .134765625 vert: serializedVersion: 2 x: -3 y: -1 width: 17 height: -69 - advance: 16 + width: 16 flipped: 0 - serializedVersion: 2 index: 107 uv: serializedVersion: 2 - x: 0.03560831 - y: 0.41601562 - width: 0.09792285 - height: 0.10546875 + x: .0356083103 + y: .416015625 + width: .0979228467 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 33 height: -54 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 108 uv: serializedVersion: 2 - x: 0.12166172 - y: 0.58203125 - width: 0.023738876 - height: 0.10546875 + x: .121661723 + y: .58203125 + width: .0237388723 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 8 height: -54 - advance: 16 + width: 16 flipped: 0 - serializedVersion: 2 index: 109 uv: serializedVersion: 2 - x: 0.19287834 - y: 0.8066406 - width: 0.15727004 - height: 0.080078125 + x: .192878336 + y: .806640625 + width: .157270029 + height: .080078125 vert: serializedVersion: 2 x: 5 y: -14 width: 53 height: -41 - advance: 60 + width: 60 flipped: 0 - serializedVersion: 2 index: 110 uv: serializedVersion: 2 - x: 0.2967359 - y: 0.91796875 - width: 0.09792283 - height: 0.078125 + x: .296735913 + y: .91796875 + width: .0979228467 + height: .078125 vert: serializedVersion: 2 x: 5 y: -14 width: 33 height: -40 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 111 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.19335938 - width: 0.109792285 - height: 0.080078125 + x: .00593471806 + y: .193359375 + width: .109792285 + height: .080078125 vert: serializedVersion: 2 x: 2 y: -14 width: 37 height: -41 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 112 uv: serializedVersion: 2 - x: 0.06231454 - y: 0.3046875 - width: 0.10385758 - height: 0.107421875 + x: .0623145401 + y: .3046875 + width: .103857569 + height: .107421875 vert: serializedVersion: 2 x: 5 y: -14 width: 35 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 113 uv: serializedVersion: 2 - x: 0.13946587 - y: 0.47070312 - width: 0.100890204 - height: 0.107421875 + x: .139465868 + y: .470703125 + width: .100890204 + height: .107421875 vert: serializedVersion: 2 x: 3 y: -14 width: 34 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 114 uv: serializedVersion: 2 - x: 0.15133531 - y: 0.609375 - width: 0.068249255 - height: 0.078125 + x: .151335314 + y: .609375 + width: .0682492554 + height: .078125 vert: serializedVersion: 2 x: 5 y: -14 width: 23 height: -40 - advance: 24 + width: 24 flipped: 0 - serializedVersion: 2 index: 115 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.109375 - width: 0.09792285 - height: 0.080078125 + x: .00593471806 + y: .109375 + width: .0979228467 + height: .080078125 vert: serializedVersion: 2 x: 2 y: -14 width: 33 height: -41 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 116 uv: serializedVersion: 2 - x: 0.109792285 - y: 0.083984375 - width: 0.062314548 - height: 0.10546875 + x: .109792285 + y: .083984375 + width: .0623145401 + height: .10546875 vert: serializedVersion: 2 x: 1 y: -2 width: 21 height: -54 - advance: 20 + width: 20 flipped: 0 - serializedVersion: 2 index: 117 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.025390625 - width: 0.09495549 - height: 0.080078125 + x: .00593471806 + y: .025390625 + width: .094955489 + height: .080078125 vert: serializedVersion: 2 x: 5 y: -15 width: 32 height: -41 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 118 uv: serializedVersion: 2 - x: 0.10682493 - y: 0.00390625 - width: 0.109792285 - height: 0.076171875 + x: .106824927 + y: .00390625 + width: .109792285 + height: .076171875 vert: serializedVersion: 2 x: 1 y: -15 width: 37 height: -39 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 119 uv: serializedVersion: 2 - x: 0.12166172 - y: 0.22460938 - width: 0.16023737 - height: 0.076171875 + x: .121661723 + y: .224609375 + width: .160237387 + height: .076171875 vert: serializedVersion: 2 x: 0 y: -15 width: 54 height: -39 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 120 uv: serializedVersion: 2 - x: 0.17804155 - y: 0.14453125 - width: 0.11275965 - height: 0.076171875 + x: .178041548 + y: .14453125 + width: .112759642 + height: .076171875 vert: serializedVersion: 2 x: 1 y: -15 width: 38 height: -39 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 121 uv: serializedVersion: 2 - x: 0.22255193 - y: 0.033203125 - width: 0.10979228 - height: 0.107421875 + x: .222551927 + y: .033203125 + width: .109792285 + height: .107421875 vert: serializedVersion: 2 x: 1 y: -15 width: 37 height: -55 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 122 uv: serializedVersion: 2 - x: 0.17210683 - y: 0.390625 - width: 0.10385758 - height: 0.076171875 + x: .172106832 + y: .390625 + width: .103857569 + height: .076171875 vert: serializedVersion: 2 x: 1 y: -15 width: 35 height: -39 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 65 uv: serializedVersion: 2 - x: 0.22551928 - y: 0.6972656 - width: 0.15133531 - height: 0.10546875 + x: .225519285 + y: .697265625 + width: .151335314 + height: .10546875 vert: serializedVersion: 2 x: 0 y: -1 width: 51 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 66 uv: serializedVersion: 2 - x: 0.3560831 - y: 0.80859375 - width: 0.12166172 - height: 0.10546875 + x: .356083095 + y: .80859375 + width: .121661723 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 41 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 67 uv: serializedVersion: 2 - x: 0.22551928 - y: 0.5839844 - width: 0.14243324 - height: 0.109375 + x: .225519285 + y: .583984375 + width: .142433241 + height: .109375 vert: serializedVersion: 2 x: 4 - y: 0 + y: -0 width: 48 height: -56 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 68 uv: serializedVersion: 2 - x: 0.2462908 - y: 0.47460938 - width: 0.13353115 - height: 0.10546875 + x: .246290803 + y: .474609375 + width: .133531153 + height: .10546875 vert: serializedVersion: 2 x: 6 y: -1 width: 45 height: -54 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 69 uv: serializedVersion: 2 - x: 0.37388724 - y: 0.5878906 - width: 0.12166172 - height: 0.10546875 + x: .373887241 + y: .587890625 + width: .121661723 + height: .10546875 vert: serializedVersion: 2 x: 6 y: -1 width: 41 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 70 uv: serializedVersion: 2 - x: 0.3827893 - y: 0.69921875 - width: 0.10979229 - height: 0.10546875 + x: .382789314 + y: .69921875 + width: .109792285 + height: .10546875 vert: serializedVersion: 2 x: 6 y: -1 width: 37 height: -54 - advance: 44 + width: 44 flipped: 0 - serializedVersion: 2 index: 71 uv: serializedVersion: 2 - x: 0.28189912 - y: 0.36132812 - width: 0.14836797 - height: 0.109375 + x: .281899124 + y: .361328125 + width: .148367956 + height: .109375 vert: serializedVersion: 2 x: 4 - y: 0 + y: -0 width: 50 height: -56 - advance: 56 + width: 56 flipped: 0 - serializedVersion: 2 index: 72 uv: serializedVersion: 2 - x: 0.38575667 - y: 0.47851562 - width: 0.12759644 - height: 0.10546875 + x: .385756671 + y: .478515625 + width: .127596438 + height: .10546875 vert: serializedVersion: 2 x: 6 y: -1 width: 43 height: -54 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 73 uv: serializedVersion: 2 - x: 0.28783384 - y: 0.25195312 - width: 0.026706219 - height: 0.10546875 + x: .28783384 + y: .251953125 + width: .0267062318 + height: .10546875 vert: serializedVersion: 2 x: 7 y: -1 width: 9 height: -54 - advance: 20 + width: 20 flipped: 0 - serializedVersion: 2 index: 74 uv: serializedVersion: 2 - x: 0.48367953 - y: 0.8886719 - width: 0.09198815 - height: 0.107421875 + x: .483679533 + y: .888671875 + width: .0919881314 + height: .107421875 vert: serializedVersion: 2 x: 2 y: -1 width: 31 height: -55 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 75 uv: serializedVersion: 2 - x: 0.49851632 - y: 0.7792969 - width: 0.13353115 - height: 0.10546875 + x: .498516321 + y: .779296875 + width: .133531153 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 45 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 76 uv: serializedVersion: 2 - x: 0.5816024 - y: 0.890625 - width: 0.10089022 - height: 0.10546875 + x: .581602395 + y: .890625 + width: .100890204 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 34 height: -54 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 77 uv: serializedVersion: 2 - x: 0.5014837 - y: 0.6699219 - width: 0.1513353 - height: 0.10546875 + x: .501483679 + y: .669921875 + width: .151335314 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 51 height: -54 - advance: 60 + width: 60 flipped: 0 - serializedVersion: 2 index: 78 uv: serializedVersion: 2 - x: 0.6379822 - y: 0.78125 - width: 0.12759644 - height: 0.10546875 + x: .63798219 + y: .78125 + width: .127596438 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 43 height: -54 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 79 uv: serializedVersion: 2 - x: 0.32047477 - y: 0.24804688 - width: 0.15430269 - height: 0.109375 + x: .320474774 + y: .248046875 + width: .154302672 + height: .109375 vert: serializedVersion: 2 x: 3 - y: 0 + y: -0 width: 52 height: -56 - advance: 56 + width: 56 flipped: 0 - serializedVersion: 2 index: 80 uv: serializedVersion: 2 - x: 0.6884273 - y: 0.890625 - width: 0.12462908 - height: 0.10546875 + x: .688427329 + y: .890625 + width: .12462908 + height: .10546875 vert: serializedVersion: 2 x: 6 y: -1 width: 42 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 81 uv: serializedVersion: 2 - x: 0.33827892 - y: 0.12890625 - width: 0.15727004 - height: 0.115234375 + x: .338278919 + y: .12890625 + width: .157270029 + height: .115234375 vert: serializedVersion: 2 x: 3 - y: 0 + y: -0 width: 53 height: -59 - advance: 56 + width: 56 flipped: 0 - serializedVersion: 2 index: 82 uv: serializedVersion: 2 - x: 0.43620178 - y: 0.36914062 - width: 0.14243326 - height: 0.10546875 + x: .436201781 + y: .369140625 + width: .142433241 + height: .10546875 vert: serializedVersion: 2 x: 6 y: -1 width: 48 height: -54 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 83 uv: serializedVersion: 2 - x: 0.48071218 - y: 0.25585938 - width: 0.12759644 - height: 0.109375 + x: .480712175 + y: .255859375 + width: .127596438 + height: .109375 vert: serializedVersion: 2 x: 3 - y: 0 + y: -0 width: 43 height: -56 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 84 uv: serializedVersion: 2 - x: 0.33827892 - y: 0.01953125 - width: 0.12759644 - height: 0.10546875 + x: .338278919 + y: .01953125 + width: .127596438 + height: .10546875 vert: serializedVersion: 2 x: 2 y: -1 width: 43 height: -54 - advance: 44 + width: 44 flipped: 0 - serializedVersion: 2 index: 85 uv: serializedVersion: 2 - x: 0.4718101 - y: 0.017578125 - width: 0.12759644 - height: 0.107421875 + x: .471810102 + y: .017578125 + width: .127596438 + height: .107421875 vert: serializedVersion: 2 x: 6 y: -1 width: 43 height: -55 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 86 uv: serializedVersion: 2 - x: 0.5014837 - y: 0.14648438 - width: 0.14836794 - height: 0.10546875 + x: .501483679 + y: .146484375 + width: .148367956 + height: .10546875 vert: serializedVersion: 2 x: 0 y: -1 width: 50 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 87 uv: serializedVersion: 2 - x: 0.60534126 - y: 0.037109375 - width: 0.2047478 - height: 0.10546875 + x: .605341256 + y: .037109375 + width: .204747781 + height: .10546875 vert: serializedVersion: 2 x: 1 y: -1 width: 69 height: -54 - advance: 68 + width: 68 flipped: 0 - serializedVersion: 2 index: 88 uv: serializedVersion: 2 - x: 0.5192878 - y: 0.5605469 - width: 0.14836794 - height: 0.10546875 + x: .519287825 + y: .560546875 + width: .148367956 + height: .10546875 vert: serializedVersion: 2 x: 0 y: -1 width: 50 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 89 uv: serializedVersion: 2 - x: 0.6587537 - y: 0.671875 - width: 0.14836794 - height: 0.10546875 + x: .658753693 + y: .671875 + width: .148367956 + height: .10546875 vert: serializedVersion: 2 x: 0 y: -1 width: 50 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 90 uv: serializedVersion: 2 - x: 0.77151334 - y: 0.78125 - width: 0.12759644 - height: 0.10546875 + x: .771513343 + y: .78125 + width: .127596438 + height: .10546875 vert: serializedVersion: 2 x: 1 y: -1 width: 43 height: -54 - advance: 44 + width: 44 flipped: 0 - serializedVersion: 2 index: 48 uv: serializedVersion: 2 - x: 0.58456975 - y: 0.44921875 - width: 0.106824934 - height: 0.107421875 + x: .584569752 + y: .44921875 + width: .106824927 + height: .107421875 vert: serializedVersion: 2 x: 3 y: -1 width: 36 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 49 uv: serializedVersion: 2 - x: 0.8189911 - y: 0.890625 - width: 0.06231457 - height: 0.10546875 + x: .818991125 + y: .890625 + width: .0623145401 + height: .10546875 vert: serializedVersion: 2 x: 8 y: -1 width: 21 height: -54 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 50 uv: serializedVersion: 2 - x: 0.88724035 - y: 0.890625 - width: 0.106824934 - height: 0.10546875 + x: .88724035 + y: .890625 + width: .106824927 + height: .10546875 vert: serializedVersion: 2 x: 2 y: -1 width: 36 height: -54 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 51 uv: serializedVersion: 2 - x: 0.6735905 - y: 0.5605469 - width: 0.106824934 - height: 0.107421875 + x: .673590481 + y: .560546875 + width: .106824927 + height: .107421875 vert: serializedVersion: 2 x: 3 y: -1 width: 36 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 52 uv: serializedVersion: 2 - x: 0.6142433 - y: 0.33984375 - width: 0.11275965 - height: 0.10546875 + x: .614243329 + y: .33984375 + width: .112759642 + height: .10546875 vert: serializedVersion: 2 x: 1 y: -1 width: 38 height: -54 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 53 uv: serializedVersion: 2 - x: 0.6973294 - y: 0.45117188 - width: 0.10979229 - height: 0.10546875 + x: .697329402 + y: .451171875 + width: .109792285 + height: .10546875 vert: serializedVersion: 2 x: 3 y: -2 width: 37 height: -54 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 54 uv: serializedVersion: 2 - x: 0.78635013 - y: 0.5605469 - width: 0.106824934 - height: 0.107421875 + x: .786350131 + y: .560546875 + width: .106824927 + height: .107421875 vert: serializedVersion: 2 x: 3 y: -1 width: 36 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 55 uv: serializedVersion: 2 - x: 0.8130564 - y: 0.6738281 - width: 0.106824934 - height: 0.103515625 + x: .813056409 + y: .673828125 + width: .106824927 + height: .103515625 vert: serializedVersion: 2 x: 3 y: -2 width: 36 height: -53 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 56 uv: serializedVersion: 2 - x: 0.65578634 - y: 0.22851562 - width: 0.106824934 - height: 0.107421875 + x: .655786335 + y: .228515625 + width: .106824927 + height: .107421875 vert: serializedVersion: 2 x: 3 y: -1 width: 36 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 57 uv: serializedVersion: 2 - x: 0.7329377 - y: 0.33984375 - width: 0.106824934 - height: 0.107421875 + x: .732937694 + y: .33984375 + width: .106824927 + height: .107421875 vert: serializedVersion: 2 x: 3 y: -1 width: 36 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 32 @@ -1076,8 +1071,8 @@ Font: x: 3 y: -1 width: 0 - height: 0 - advance: 20 + height: -0 + width: 20 flipped: 0 m_Texture: {fileID: 0} m_KerningValues: @@ -1276,10 +1271,10 @@ Font: - first: 102: 102 second: -1 - m_PixelScale: 0.1 + m_PixelScale: .100000001 m_FontData: m_FontSize: 72 - m_Ascent: 0 + m_Ascent: 53 m_DefaultStyle: 0 m_FontNames: [] m_FallbackFonts: [] diff --git a/Assets/BitmapFontImporter/Examples/Font1/font1.fontsettings.meta b/Assets/BitmapFontImporter/Examples/Font1/font1.fontsettings.meta index 90b31fa..6346882 100644 --- a/Assets/BitmapFontImporter/Examples/Font1/font1.fontsettings.meta +++ b/Assets/BitmapFontImporter/Examples/Font1/font1.fontsettings.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 0fa234bf184923048b6dca696287cf89 -timeCreated: 1462353801 -licenseType: Pro +guid: e5ae7b9800b95a2419475e02fa72f67d +timeCreated: 1487006540 +licenseType: Free NativeFormatImporter: userData: assetBundleName: diff --git a/Assets/BitmapFontImporter/Examples/Font1/font1.png.meta b/Assets/BitmapFontImporter/Examples/Font1/font1.png.meta index 56f922f..6c910dc 100644 --- a/Assets/BitmapFontImporter/Examples/Font1/font1.png.meta +++ b/Assets/BitmapFontImporter/Examples/Font1/font1.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: cef3086250d642b4aada4bec015cacce -timeCreated: 1466378031 +timeCreated: 1487007175 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,12 +37,11 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 @@ -50,7 +49,6 @@ TextureImporter: buildTargetSettings: [] spriteSheet: sprites: [] - outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/BitmapFontImporter/Examples/Font2.meta b/Assets/BitmapFontImporter/Examples/Font2.meta index 6dcc579..8b358d6 100644 --- a/Assets/BitmapFontImporter/Examples/Font2.meta +++ b/Assets/BitmapFontImporter/Examples/Font2.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 185da8e448e64784a802cfadcdd37bc1 +guid: f67f8d068155ff94bb033de495facf4a folderAsset: yes -timeCreated: 1462352496 -licenseType: Pro +timeCreated: 1487006409 +licenseType: Free DefaultImporter: userData: assetBundleName: diff --git a/Assets/BitmapFontImporter/Examples/Font2/font2.fnt.meta b/Assets/BitmapFontImporter/Examples/Font2/font2.fnt.meta index 0578612..ec2aa49 100644 --- a/Assets/BitmapFontImporter/Examples/Font2/font2.fnt.meta +++ b/Assets/BitmapFontImporter/Examples/Font2/font2.fnt.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: a6ca510a1cee5f146ab5f42116115b4f -timeCreated: 1462352497 -licenseType: Pro +guid: 93ce8c2ea92a38c42995c839667d471e +timeCreated: 1487006414 +licenseType: Free TextScriptImporter: userData: assetBundleName: diff --git a/Assets/BitmapFontImporter/Examples/Font2/font2.fontsettings b/Assets/BitmapFontImporter/Examples/Font2/font2.fontsettings index 3dfaced..9d897fc 100644 --- a/Assets/BitmapFontImporter/Examples/Font2/font2.fontsettings +++ b/Assets/BitmapFontImporter/Examples/Font2/font2.fontsettings @@ -1,8 +1,8 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!21 &2185014 +--- !u!21 &2163128 Material: - serializedVersion: 6 + serializedVersion: 5 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} @@ -11,7 +11,6 @@ Material: m_ShaderKeywords: m_LightmapFlags: 5 m_CustomRenderQueue: -1 - stringTagMap: {} m_SavedProperties: serializedVersion: 2 m_TexEnvs: @@ -19,7 +18,7 @@ Material: first: name: _MainTex second: - m_Texture: {fileID: 2800000, guid: 2fb697a8449a17e47a0187c1047b3c9c, type: 3} + m_Texture: {fileID: 2800000, guid: 54d311ecccfa8b74eb45ea65ba80a788, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: @@ -47,10 +46,6 @@ Material: first: name: _ColorMask second: 15 - data: - first: - name: _UseUIAlphaClip - second: 0 m_Colors: data: first: @@ -64,1004 +59,1004 @@ Font: m_Name: font2 serializedVersion: 4 m_AsciiStartOffset: 0 - m_Tracking: 1 + m_Kerning: 1 m_LineSpacing: 80 m_CharacterSpacing: 1 m_CharacterPadding: 0 m_ConvertCase: 0 - m_DefaultMaterial: {fileID: 2185014} + m_DefaultMaterial: {fileID: 2163128} m_CharacterRects: - serializedVersion: 2 index: 97 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.9160156 - width: 0.109792285 - height: 0.080078125 + x: .00593471806 + y: .916015625 + width: .109792285 + height: .080078125 vert: serializedVersion: 2 x: 3 y: -14 width: 37 height: -41 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 98 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.8046875 - width: 0.10385757 - height: 0.107421875 + x: .00593471806 + y: .8046875 + width: .103857569 + height: .107421875 vert: serializedVersion: 2 x: 5 y: -1 width: 35 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 99 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.7207031 - width: 0.10385757 - height: 0.080078125 + x: .00593471806 + y: .720703125 + width: .103857569 + height: .080078125 vert: serializedVersion: 2 x: 3 y: -14 width: 35 height: -41 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 100 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.609375 - width: 0.10385757 - height: 0.107421875 + x: .00593471806 + y: .609375 + width: .103857569 + height: .107421875 vert: serializedVersion: 2 x: 2 y: -1 width: 35 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 101 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.5253906 - width: 0.109792285 - height: 0.080078125 + x: .00593471806 + y: .525390625 + width: .109792285 + height: .080078125 vert: serializedVersion: 2 x: 3 y: -14 width: 37 height: -41 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 102 uv: serializedVersion: 2 - x: 0.115727 - y: 0.8046875 - width: 0.07121662 - height: 0.107421875 + x: .115727 + y: .8046875 + width: .0712166205 + height: .107421875 vert: serializedVersion: 2 x: 1 - y: 0 + y: -0 width: 24 height: -55 - advance: 20 + width: 20 flipped: 0 - serializedVersion: 2 index: 103 uv: serializedVersion: 2 - x: 0.115727 - y: 0.69140625 - width: 0.10385757 - height: 0.109375 + x: .115727 + y: .69140625 + width: .103857569 + height: .109375 vert: serializedVersion: 2 x: 2 y: -14 width: 35 height: -56 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 104 uv: serializedVersion: 2 - x: 0.19287834 - y: 0.890625 - width: 0.09792283 - height: 0.10546875 + x: .192878336 + y: .890625 + width: .0979228467 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 33 height: -54 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 105 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.41601562 - width: 0.023738872 - height: 0.10546875 + x: .00593471806 + y: .416015625 + width: .0237388723 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 8 height: -54 - advance: 16 + width: 16 flipped: 0 - serializedVersion: 2 index: 106 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.27734375 - width: 0.050445102 - height: 0.13476562 + x: .00593471806 + y: .27734375 + width: .0504451022 + height: .134765625 vert: serializedVersion: 2 x: -3 y: -1 width: 17 height: -69 - advance: 16 + width: 16 flipped: 0 - serializedVersion: 2 index: 107 uv: serializedVersion: 2 - x: 0.03560831 - y: 0.41601562 - width: 0.09792285 - height: 0.10546875 + x: .0356083103 + y: .416015625 + width: .0979228467 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 33 height: -54 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 108 uv: serializedVersion: 2 - x: 0.12166172 - y: 0.58203125 - width: 0.023738876 - height: 0.10546875 + x: .121661723 + y: .58203125 + width: .0237388723 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 8 height: -54 - advance: 16 + width: 16 flipped: 0 - serializedVersion: 2 index: 109 uv: serializedVersion: 2 - x: 0.19287834 - y: 0.8066406 - width: 0.15727004 - height: 0.080078125 + x: .192878336 + y: .806640625 + width: .157270029 + height: .080078125 vert: serializedVersion: 2 x: 5 y: -14 width: 53 height: -41 - advance: 60 + width: 60 flipped: 0 - serializedVersion: 2 index: 110 uv: serializedVersion: 2 - x: 0.2967359 - y: 0.91796875 - width: 0.09792283 - height: 0.078125 + x: .296735913 + y: .91796875 + width: .0979228467 + height: .078125 vert: serializedVersion: 2 x: 5 y: -14 width: 33 height: -40 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 111 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.19335938 - width: 0.109792285 - height: 0.080078125 + x: .00593471806 + y: .193359375 + width: .109792285 + height: .080078125 vert: serializedVersion: 2 x: 2 y: -14 width: 37 height: -41 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 112 uv: serializedVersion: 2 - x: 0.06231454 - y: 0.3046875 - width: 0.10385758 - height: 0.107421875 + x: .0623145401 + y: .3046875 + width: .103857569 + height: .107421875 vert: serializedVersion: 2 x: 5 y: -14 width: 35 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 113 uv: serializedVersion: 2 - x: 0.13946587 - y: 0.47070312 - width: 0.100890204 - height: 0.107421875 + x: .139465868 + y: .470703125 + width: .100890204 + height: .107421875 vert: serializedVersion: 2 x: 3 y: -14 width: 34 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 114 uv: serializedVersion: 2 - x: 0.15133531 - y: 0.609375 - width: 0.068249255 - height: 0.078125 + x: .151335314 + y: .609375 + width: .0682492554 + height: .078125 vert: serializedVersion: 2 x: 5 y: -14 width: 23 height: -40 - advance: 24 + width: 24 flipped: 0 - serializedVersion: 2 index: 115 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.109375 - width: 0.09792285 - height: 0.080078125 + x: .00593471806 + y: .109375 + width: .0979228467 + height: .080078125 vert: serializedVersion: 2 x: 2 y: -14 width: 33 height: -41 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 116 uv: serializedVersion: 2 - x: 0.109792285 - y: 0.083984375 - width: 0.062314548 - height: 0.10546875 + x: .109792285 + y: .083984375 + width: .0623145401 + height: .10546875 vert: serializedVersion: 2 x: 1 y: -2 width: 21 height: -54 - advance: 20 + width: 20 flipped: 0 - serializedVersion: 2 index: 117 uv: serializedVersion: 2 - x: 0.005934718 - y: 0.025390625 - width: 0.09495549 - height: 0.080078125 + x: .00593471806 + y: .025390625 + width: .094955489 + height: .080078125 vert: serializedVersion: 2 x: 5 y: -15 width: 32 height: -41 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 118 uv: serializedVersion: 2 - x: 0.10682493 - y: 0.00390625 - width: 0.109792285 - height: 0.076171875 + x: .106824927 + y: .00390625 + width: .109792285 + height: .076171875 vert: serializedVersion: 2 x: 1 y: -15 width: 37 height: -39 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 119 uv: serializedVersion: 2 - x: 0.12166172 - y: 0.22460938 - width: 0.16023737 - height: 0.076171875 + x: .121661723 + y: .224609375 + width: .160237387 + height: .076171875 vert: serializedVersion: 2 x: 0 y: -15 width: 54 height: -39 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 120 uv: serializedVersion: 2 - x: 0.17804155 - y: 0.14453125 - width: 0.11275965 - height: 0.076171875 + x: .178041548 + y: .14453125 + width: .112759642 + height: .076171875 vert: serializedVersion: 2 x: 1 y: -15 width: 38 height: -39 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 121 uv: serializedVersion: 2 - x: 0.22255193 - y: 0.033203125 - width: 0.10979228 - height: 0.107421875 + x: .222551927 + y: .033203125 + width: .109792285 + height: .107421875 vert: serializedVersion: 2 x: 1 y: -15 width: 37 height: -55 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 122 uv: serializedVersion: 2 - x: 0.17210683 - y: 0.390625 - width: 0.10385758 - height: 0.076171875 + x: .172106832 + y: .390625 + width: .103857569 + height: .076171875 vert: serializedVersion: 2 x: 1 y: -15 width: 35 height: -39 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 65 uv: serializedVersion: 2 - x: 0.22551928 - y: 0.6972656 - width: 0.15133531 - height: 0.10546875 + x: .225519285 + y: .697265625 + width: .151335314 + height: .10546875 vert: serializedVersion: 2 x: 0 y: -1 width: 51 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 66 uv: serializedVersion: 2 - x: 0.3560831 - y: 0.80859375 - width: 0.12166172 - height: 0.10546875 + x: .356083095 + y: .80859375 + width: .121661723 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 41 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 67 uv: serializedVersion: 2 - x: 0.22551928 - y: 0.5839844 - width: 0.14243324 - height: 0.109375 + x: .225519285 + y: .583984375 + width: .142433241 + height: .109375 vert: serializedVersion: 2 x: 4 - y: 0 + y: -0 width: 48 height: -56 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 68 uv: serializedVersion: 2 - x: 0.2462908 - y: 0.47460938 - width: 0.13353115 - height: 0.10546875 + x: .246290803 + y: .474609375 + width: .133531153 + height: .10546875 vert: serializedVersion: 2 x: 6 y: -1 width: 45 height: -54 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 69 uv: serializedVersion: 2 - x: 0.37388724 - y: 0.5878906 - width: 0.12166172 - height: 0.10546875 + x: .373887241 + y: .587890625 + width: .121661723 + height: .10546875 vert: serializedVersion: 2 x: 6 y: -1 width: 41 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 70 uv: serializedVersion: 2 - x: 0.3827893 - y: 0.69921875 - width: 0.10979229 - height: 0.10546875 + x: .382789314 + y: .69921875 + width: .109792285 + height: .10546875 vert: serializedVersion: 2 x: 6 y: -1 width: 37 height: -54 - advance: 44 + width: 44 flipped: 0 - serializedVersion: 2 index: 71 uv: serializedVersion: 2 - x: 0.28189912 - y: 0.36132812 - width: 0.14836797 - height: 0.109375 + x: .281899124 + y: .361328125 + width: .148367956 + height: .109375 vert: serializedVersion: 2 x: 4 - y: 0 + y: -0 width: 50 height: -56 - advance: 56 + width: 56 flipped: 0 - serializedVersion: 2 index: 72 uv: serializedVersion: 2 - x: 0.38575667 - y: 0.47851562 - width: 0.12759644 - height: 0.10546875 + x: .385756671 + y: .478515625 + width: .127596438 + height: .10546875 vert: serializedVersion: 2 x: 6 y: -1 width: 43 height: -54 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 73 uv: serializedVersion: 2 - x: 0.28783384 - y: 0.25195312 - width: 0.026706219 - height: 0.10546875 + x: .28783384 + y: .251953125 + width: .0267062318 + height: .10546875 vert: serializedVersion: 2 x: 7 y: -1 width: 9 height: -54 - advance: 20 + width: 20 flipped: 0 - serializedVersion: 2 index: 74 uv: serializedVersion: 2 - x: 0.48367953 - y: 0.8886719 - width: 0.09198815 - height: 0.107421875 + x: .483679533 + y: .888671875 + width: .0919881314 + height: .107421875 vert: serializedVersion: 2 x: 2 y: -1 width: 31 height: -55 - advance: 36 + width: 36 flipped: 0 - serializedVersion: 2 index: 75 uv: serializedVersion: 2 - x: 0.49851632 - y: 0.7792969 - width: 0.13353115 - height: 0.10546875 + x: .498516321 + y: .779296875 + width: .133531153 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 45 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 76 uv: serializedVersion: 2 - x: 0.5816024 - y: 0.890625 - width: 0.10089022 - height: 0.10546875 + x: .581602395 + y: .890625 + width: .100890204 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 34 height: -54 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 77 uv: serializedVersion: 2 - x: 0.5014837 - y: 0.6699219 - width: 0.1513353 - height: 0.10546875 + x: .501483679 + y: .669921875 + width: .151335314 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 51 height: -54 - advance: 60 + width: 60 flipped: 0 - serializedVersion: 2 index: 78 uv: serializedVersion: 2 - x: 0.6379822 - y: 0.78125 - width: 0.12759644 - height: 0.10546875 + x: .63798219 + y: .78125 + width: .127596438 + height: .10546875 vert: serializedVersion: 2 x: 5 y: -1 width: 43 height: -54 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 79 uv: serializedVersion: 2 - x: 0.32047477 - y: 0.24804688 - width: 0.15430269 - height: 0.109375 + x: .320474774 + y: .248046875 + width: .154302672 + height: .109375 vert: serializedVersion: 2 x: 3 - y: 0 + y: -0 width: 52 height: -56 - advance: 56 + width: 56 flipped: 0 - serializedVersion: 2 index: 80 uv: serializedVersion: 2 - x: 0.6884273 - y: 0.890625 - width: 0.12462908 - height: 0.10546875 + x: .688427329 + y: .890625 + width: .12462908 + height: .10546875 vert: serializedVersion: 2 x: 6 y: -1 width: 42 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 81 uv: serializedVersion: 2 - x: 0.33827892 - y: 0.12890625 - width: 0.15727004 - height: 0.115234375 + x: .338278919 + y: .12890625 + width: .157270029 + height: .115234375 vert: serializedVersion: 2 x: 3 - y: 0 + y: -0 width: 53 height: -59 - advance: 56 + width: 56 flipped: 0 - serializedVersion: 2 index: 82 uv: serializedVersion: 2 - x: 0.43620178 - y: 0.36914062 - width: 0.14243326 - height: 0.10546875 + x: .436201781 + y: .369140625 + width: .142433241 + height: .10546875 vert: serializedVersion: 2 x: 6 y: -1 width: 48 height: -54 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 83 uv: serializedVersion: 2 - x: 0.48071218 - y: 0.25585938 - width: 0.12759644 - height: 0.109375 + x: .480712175 + y: .255859375 + width: .127596438 + height: .109375 vert: serializedVersion: 2 x: 3 - y: 0 + y: -0 width: 43 height: -56 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 84 uv: serializedVersion: 2 - x: 0.33827892 - y: 0.01953125 - width: 0.12759644 - height: 0.10546875 + x: .338278919 + y: .01953125 + width: .127596438 + height: .10546875 vert: serializedVersion: 2 x: 2 y: -1 width: 43 height: -54 - advance: 44 + width: 44 flipped: 0 - serializedVersion: 2 index: 85 uv: serializedVersion: 2 - x: 0.4718101 - y: 0.017578125 - width: 0.12759644 - height: 0.107421875 + x: .471810102 + y: .017578125 + width: .127596438 + height: .107421875 vert: serializedVersion: 2 x: 6 y: -1 width: 43 height: -55 - advance: 52 + width: 52 flipped: 0 - serializedVersion: 2 index: 86 uv: serializedVersion: 2 - x: 0.5014837 - y: 0.14648438 - width: 0.14836794 - height: 0.10546875 + x: .501483679 + y: .146484375 + width: .148367956 + height: .10546875 vert: serializedVersion: 2 x: 0 y: -1 width: 50 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 87 uv: serializedVersion: 2 - x: 0.60534126 - y: 0.037109375 - width: 0.2047478 - height: 0.10546875 + x: .605341256 + y: .037109375 + width: .204747781 + height: .10546875 vert: serializedVersion: 2 x: 1 y: -1 width: 69 height: -54 - advance: 68 + width: 68 flipped: 0 - serializedVersion: 2 index: 88 uv: serializedVersion: 2 - x: 0.5192878 - y: 0.5605469 - width: 0.14836794 - height: 0.10546875 + x: .519287825 + y: .560546875 + width: .148367956 + height: .10546875 vert: serializedVersion: 2 x: 0 y: -1 width: 50 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 89 uv: serializedVersion: 2 - x: 0.6587537 - y: 0.671875 - width: 0.14836794 - height: 0.10546875 + x: .658753693 + y: .671875 + width: .148367956 + height: .10546875 vert: serializedVersion: 2 x: 0 y: -1 width: 50 height: -54 - advance: 48 + width: 48 flipped: 0 - serializedVersion: 2 index: 90 uv: serializedVersion: 2 - x: 0.77151334 - y: 0.78125 - width: 0.12759644 - height: 0.10546875 + x: .771513343 + y: .78125 + width: .127596438 + height: .10546875 vert: serializedVersion: 2 x: 1 y: -1 width: 43 height: -54 - advance: 44 + width: 44 flipped: 0 - serializedVersion: 2 index: 48 uv: serializedVersion: 2 - x: 0.58456975 - y: 0.44921875 - width: 0.106824934 - height: 0.107421875 + x: .584569752 + y: .44921875 + width: .106824927 + height: .107421875 vert: serializedVersion: 2 x: 3 y: -1 width: 36 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 49 uv: serializedVersion: 2 - x: 0.8189911 - y: 0.890625 - width: 0.06231457 - height: 0.10546875 + x: .818991125 + y: .890625 + width: .0623145401 + height: .10546875 vert: serializedVersion: 2 x: 8 y: -1 width: 21 height: -54 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 50 uv: serializedVersion: 2 - x: 0.88724035 - y: 0.890625 - width: 0.106824934 - height: 0.10546875 + x: .88724035 + y: .890625 + width: .106824927 + height: .10546875 vert: serializedVersion: 2 x: 2 y: -1 width: 36 height: -54 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 51 uv: serializedVersion: 2 - x: 0.6735905 - y: 0.5605469 - width: 0.106824934 - height: 0.107421875 + x: .673590481 + y: .560546875 + width: .106824927 + height: .107421875 vert: serializedVersion: 2 x: 3 y: -1 width: 36 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 52 uv: serializedVersion: 2 - x: 0.6142433 - y: 0.33984375 - width: 0.11275965 - height: 0.10546875 + x: .614243329 + y: .33984375 + width: .112759642 + height: .10546875 vert: serializedVersion: 2 x: 1 y: -1 width: 38 height: -54 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 53 uv: serializedVersion: 2 - x: 0.6973294 - y: 0.45117188 - width: 0.10979229 - height: 0.10546875 + x: .697329402 + y: .451171875 + width: .109792285 + height: .10546875 vert: serializedVersion: 2 x: 3 y: -2 width: 37 height: -54 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 54 uv: serializedVersion: 2 - x: 0.78635013 - y: 0.5605469 - width: 0.106824934 - height: 0.107421875 + x: .786350131 + y: .560546875 + width: .106824927 + height: .107421875 vert: serializedVersion: 2 x: 3 y: -1 width: 36 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 55 uv: serializedVersion: 2 - x: 0.8130564 - y: 0.6738281 - width: 0.106824934 - height: 0.103515625 + x: .813056409 + y: .673828125 + width: .106824927 + height: .103515625 vert: serializedVersion: 2 x: 3 y: -2 width: 36 height: -53 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 56 uv: serializedVersion: 2 - x: 0.65578634 - y: 0.22851562 - width: 0.106824934 - height: 0.107421875 + x: .655786335 + y: .228515625 + width: .106824927 + height: .107421875 vert: serializedVersion: 2 x: 3 y: -1 width: 36 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 57 uv: serializedVersion: 2 - x: 0.7329377 - y: 0.33984375 - width: 0.106824934 - height: 0.107421875 + x: .732937694 + y: .33984375 + width: .106824927 + height: .107421875 vert: serializedVersion: 2 x: 3 y: -1 width: 36 height: -55 - advance: 40 + width: 40 flipped: 0 - serializedVersion: 2 index: 32 @@ -1076,8 +1071,8 @@ Font: x: 3 y: -1 width: 0 - height: 0 - advance: 20 + height: -0 + width: 20 flipped: 0 m_Texture: {fileID: 0} m_KerningValues: @@ -1276,10 +1271,10 @@ Font: - first: 102: 102 second: -1 - m_PixelScale: 0.1 + m_PixelScale: .100000001 m_FontData: m_FontSize: 72 - m_Ascent: 0 + m_Ascent: 53 m_DefaultStyle: 0 m_FontNames: [] m_FallbackFonts: [] diff --git a/Assets/BitmapFontImporter/Examples/Font2/font2.fontsettings.meta b/Assets/BitmapFontImporter/Examples/Font2/font2.fontsettings.meta index f7b3126..9127c4a 100644 --- a/Assets/BitmapFontImporter/Examples/Font2/font2.fontsettings.meta +++ b/Assets/BitmapFontImporter/Examples/Font2/font2.fontsettings.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 6a4ed5728926f31488aa1d9f30c0de7a -timeCreated: 1462353807 -licenseType: Pro +guid: a84c815566f58454a9221b11efe70086 +timeCreated: 1487006540 +licenseType: Free NativeFormatImporter: userData: assetBundleName: diff --git a/Assets/BitmapFontImporter/Examples/Font2/font2.png.meta b/Assets/BitmapFontImporter/Examples/Font2/font2.png.meta index 60cf439..aff6962 100644 --- a/Assets/BitmapFontImporter/Examples/Font2/font2.png.meta +++ b/Assets/BitmapFontImporter/Examples/Font2/font2.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 2fb697a8449a17e47a0187c1047b3c9c -timeCreated: 1466378031 +guid: 54d311ecccfa8b74eb45ea65ba80a788 +timeCreated: 1487007175 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: 0.25 + heightScale: .25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,12 +37,11 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 @@ -50,7 +49,6 @@ TextureImporter: buildTargetSettings: [] spriteSheet: sprites: [] - outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/BitmapFontImporter/Examples/test.unity b/Assets/BitmapFontImporter/Examples/test.unity index 2fa6fba..787bc0c 100644 --- a/Assets/BitmapFontImporter/Examples/test.unity +++ b/Assets/BitmapFontImporter/Examples/test.unity @@ -8,25 +8,25 @@ SceneSettings: m_PVSPortalsArray: [] m_OcclusionBakeSettings: smallestOccluder: 5 - smallestHole: 0.25 + smallestHole: .25 backfaceThreshold: 100 --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 6 m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogColor: {r: .5, g: .5, b: .5, a: 1} m_FogMode: 3 - m_FogDensity: 0.01 + m_FogDensity: .00999999978 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientSkyColor: {r: .211999997, g: .226999998, b: .259000003, a: 1} + m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1} + m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 0 m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 + m_HaloStrength: .5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 m_HaloTexture: {fileID: 0} @@ -40,7 +40,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + serializedVersion: 5 m_GIWorkflowMode: 0 m_LightmapsMode: 1 m_GISettings: @@ -65,8 +65,7 @@ LightmapSettings: m_TextureCompression: 1 m_FinalGather: 0 m_FinalGatherRayCount: 1024 - m_ReflectionCompression: 2 - m_LightingDataAsset: {fileID: 0} + m_LightmapSnapshot: {fileID: 0} m_RuntimeCPUUsage: 25 --- !u!196 &4 NavMeshSettings: @@ -74,17 +73,20 @@ NavMeshSettings: m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 - agentRadius: 0.5 + agentRadius: .5 agentHeight: 2 agentSlope: 45 - agentClimb: 0.4 + agentClimb: .400000006 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 accuratePlacement: 0 minRegionArea: 2 - cellSize: 0.16666667 + cellSize: .166666672 manualCellSize: 0 m_NavMeshData: {fileID: 0} +--- !u!127 &5 +LevelGameManager: + m_ObjectHideFlags: 0 --- !u!1 &71931338 GameObject: m_ObjectHideFlags: 0 @@ -134,14 +136,14 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0.019607844} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: .0196078438} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 y: 0 width: 1 height: 1 - near clip plane: 0.3 + near clip plane: .300000012 far clip plane: 1000 field of view: 60 orthographic: 0 @@ -153,12 +155,10 @@ Camera: m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 - m_TargetEye: 3 m_HDR: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 - m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 + m_StereoSeparation: .0219999999 --- !u!4 &71931343 Transform: m_ObjectHideFlags: 0 @@ -200,11 +200,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 1416898153} m_RootOrder: 1 - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -59.95, y: -114} - m_SizeDelta: {x: 379.9, y: 157.9} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -59.9500008, y: -114} + m_SizeDelta: {x: 379.899994, y: 157.899994} + m_Pivot: {x: .5, y: .5} --- !u!114 &295656969 MonoBehaviour: m_ObjectHideFlags: 0 @@ -216,23 +216,16 @@ MonoBehaviour: m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2185014, guid: 6a4ed5728926f31488aa1d9f30c0de7a, type: 2} + 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: 12800000, guid: 6a4ed5728926f31488aa1d9f30c0de7a, type: 2} + m_Font: {fileID: 12800000, guid: a84c815566f58454a9221b11efe70086, type: 2} m_FontSize: 72 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 72 - m_Alignment: 0 - m_AlignByGeometry: 0 + m_Alignment: 6 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -273,7 +266,7 @@ MonoBehaviour: m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_ForceModuleActive: 0 + m_AllowActivationOnStandalone: 0 --- !u!114 &414384917 MonoBehaviour: m_ObjectHideFlags: 0 @@ -290,8 +283,7 @@ MonoBehaviour: m_SubmitButton: Submit m_CancelButton: Cancel m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 + m_AllowActivationOnMobileDevice: 0 --- !u!114 &414384918 MonoBehaviour: m_ObjectHideFlags: 0 @@ -343,7 +335,7 @@ Light: m_Enabled: 1 serializedVersion: 6 m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: .956862748, b: .839215696, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -352,9 +344,8 @@ Light: m_Type: 2 m_Resolution: -1 m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 + m_Bias: .0500000007 + m_NormalBias: .400000006 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -373,7 +364,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1352413706} - m_LocalRotation: {x: 0.40821794, y: -0.23456973, z: 0.109381676, w: 0.87542605} + m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381676, w: .875426054} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -449,10 +440,8 @@ Canvas: m_ReceivesEvents: 1 m_OverrideSorting: 0 m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 m_SortingLayerID: 0 m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!224 &1416898153 RectTransform: m_ObjectHideFlags: 0 @@ -501,11 +490,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 1416898153} m_RootOrder: 0 - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} m_AnchoredPosition: {x: -62, y: 73} m_SizeDelta: {x: 384, y: 146} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: .5, y: .5} --- !u!114 &1939193853 MonoBehaviour: m_ObjectHideFlags: 0 @@ -519,21 +508,14 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2125084, guid: 0fa234bf184923048b6dca696287cf89, type: 2} 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: 12800000, guid: 0fa234bf184923048b6dca696287cf89, type: 2} + m_Font: {fileID: 12800000, guid: e5ae7b9800b95a2419475e02fa72f67d, type: 2} m_FontSize: 72 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 72 m_Alignment: 0 - m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 diff --git a/Assets/BitmapFontImporter/Examples/test.unity.meta b/Assets/BitmapFontImporter/Examples/test.unity.meta index 16f79b7..c76264d 100644 --- a/Assets/BitmapFontImporter/Examples/test.unity.meta +++ b/Assets/BitmapFontImporter/Examples/test.unity.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 89216c3b07ad4e541944a18b937288bb -timeCreated: 1462354120 -licenseType: Pro +guid: 3a21865da47928448914cb14b377431e +timeCreated: 1487006409 +licenseType: Free DefaultImporter: userData: assetBundleName: diff --git a/Assets/BitmapFontImporter/README.rtf.meta b/Assets/BitmapFontImporter/README.rtf.meta index 5d04dfd..9f08f23 100644 --- a/Assets/BitmapFontImporter/README.rtf.meta +++ b/Assets/BitmapFontImporter/README.rtf.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: da8ea6a71d0dbd348a843b876ddae220 -timeCreated: 1463029515 +guid: 2248d48bd53da1a4681a9fa9fb8bf213 +timeCreated: 1487006409 licenseType: Free DefaultImporter: userData: diff --git a/Assets/Test.meta b/Assets/Test.meta index caf826c..73ace68 100644 --- a/Assets/Test.meta +++ b/Assets/Test.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 8ee19e665fc7d36428f5f3e7fec3db04 +guid: e3fb26a220efd414b9212ddf88994d81 folderAsset: yes -timeCreated: 1463057217 +timeCreated: 1487006409 licenseType: Free DefaultImporter: userData: diff --git a/Assets/Test/Editor.meta b/Assets/Test/Editor.meta index fa49061..f3a76f0 100644 --- a/Assets/Test/Editor.meta +++ b/Assets/Test/Editor.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: e9006fe6801a636438a350d9aa9705d5 +guid: 36ded8813e7aee04fb7ccdbf49f19b39 folderAsset: yes -timeCreated: 1463060320 +timeCreated: 1487006409 licenseType: Free DefaultImporter: userData: diff --git a/Assets/Test/Editor/MyTest.cs.meta b/Assets/Test/Editor/MyTest.cs.meta index 260d683..0046f35 100644 --- a/Assets/Test/Editor/MyTest.cs.meta +++ b/Assets/Test/Editor/MyTest.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: f6d544b2a244e1e44a384e5aca33d00c -timeCreated: 1463057233 +guid: 3260b873d8c33f54f918541842e68f09 +timeCreated: 1487006410 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index faf901c..c7a0ae1 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -11,5 +11,4 @@ AudioManager: m_DSPBufferSize: 0 m_VirtualVoiceCount: 512 m_RealVoiceCount: 32 - m_SpatializerPlugin: m_DisableAudio: 0 diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset deleted file mode 100644 index e7886b2..0000000 --- a/ProjectSettings/ClusterInputManager.asset +++ /dev/null @@ -1,6 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!236 &1 -ClusterInputManager: - m_ObjectHideFlags: 0 - m_Inputs: [] diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index bb9f46e..dd3756e 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -3,13 +3,12 @@ --- !u!55 &1 PhysicsManager: m_ObjectHideFlags: 0 - serializedVersion: 2 m_Gravity: {x: 0, y: -9.81000042, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 m_SleepThreshold: .00499999989 m_DefaultContactOffset: .00999999978 m_SolverIterationCount: 6 - m_QueriesHitTriggers: 1 + m_RaycastsHitTriggers: 1 m_EnableAdaptiveForce: 0 m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 7726ac9..303edf7 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -4,12 +4,9 @@ EditorSettings: m_ObjectHideFlags: 0 serializedVersion: 3 - m_ExternalVersionControlSupport: Hidden Meta Files + m_ExternalVersionControlSupport: Visible Meta Files m_SerializationMode: 2 m_WebSecurityEmulationEnabled: 0 m_WebSecurityEmulationHostUrl: http://www.mydomain.com/mygame.unity3d m_DefaultBehaviorMode: 0 m_SpritePackerMode: 2 - m_SpritePackerPaddingPower: 1 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd - m_ProjectGenerationRootNamespace: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 5a96ca8..280a9fd 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,13 +3,10 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 5 + serializedVersion: 3 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} - m_DeferredReflections: - m_Mode: 1 - m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} m_LegacyDeferred: m_Mode: 1 m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} @@ -21,17 +18,12 @@ GraphicsSettings: - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] - m_ShaderSettings: - useScreenSpaceShadows: 1 - m_BuildTargetShaderSettings: [] m_LightmapStripping: 0 - m_FogStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 1 m_LightmapKeepDirSeparate: 1 - m_LightmapKeepDynamicPlain: 1 - m_LightmapKeepDynamicDirCombined: 1 - m_LightmapKeepDynamicDirSeparate: 1 + m_LightmapKeepDynamic: 1 + m_FogStripping: 0 m_FogKeepLinear: 1 m_FogKeepExp: 1 m_FogKeepExp2: 1 diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index b5ba40c..0a69793 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -74,7 +74,7 @@ InputManager: descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: left shift + positiveButton: left cmd altNegativeButton: altPositiveButton: mouse 2 gravity: 1000 diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index 80b5feb..5418c58 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -3,7 +3,6 @@ --- !u!19 &1 Physics2DSettings: m_ObjectHideFlags: 0 - serializedVersion: 2 m_Gravity: {x: 0, y: -9.81000042} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 @@ -19,7 +18,7 @@ Physics2DSettings: m_TimeToSleep: .5 m_LinearSleepTolerance: .00999999978 m_AngularSleepTolerance: 2 - m_QueriesHitTriggers: 1 - m_QueriesStartInColliders: 1 + m_RaycastsHitTriggers: 1 + m_RaycastsStartInColliders: 1 m_ChangeStopsCallbacks: 0 m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 29f3b9a..e4b8078 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,18 +3,19 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 6 AndroidProfiler: 0 defaultScreenOrientation: 4 targetDevice: 2 - useOnDemandResources: 0 + targetGlesGraphics: -1 + targetIOSGraphics: -1 + targetResolution: 0 accelerometerFrequency: 60 companyName: DefaultCompany - productName: BitmapFontImporter + productName: Unity-BitmapFontImporter + cloudProjectId: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} - m_ShowUnitySplashScreen: 1 - m_VirtualRealitySplashScreen: {fileID: 0} defaultScreenWidth: 1024 defaultScreenHeight: 768 defaultScreenWidthWeb: 960 @@ -24,12 +25,12 @@ PlayerSettings: m_ActiveColorSpace: 0 m_MTRendering: 1 m_MobileMTRendering: 0 + m_UseDX11: 1 m_Stereoscopic3D: 0 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -56,33 +57,17 @@ PlayerSettings: xboxEnableKinectAutoTracking: 0 xboxEnableFitness: 0 visibleInBackground: 0 - allowFullscreenSwitch: 1 macFullscreenMode: 2 d3d9FullscreenMode: 1 d3d11FullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 - xboxEnablePIXSampling: 0 - n3dsDisableStereoscopicView: 0 - n3dsEnableSharedListOpt: 1 - n3dsEnableVSync: 0 - uiUse16BitDepthBuffer: 0 - ignoreAlphaClear: 0 xboxOneResolution: 0 ps3SplashScreen: {fileID: 0} videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 psp2AcquireBGM: 1 - wiiUTVResolution: 0 - wiiUGamePadMSAA: 1 - wiiUSupportsNunchuk: 0 - wiiUSupportsClassicController: 0 - wiiUSupportsBalanceBoard: 0 - wiiUSupportsMotionPlus: 0 - wiiUSupportsProController: 0 - wiiUAllowScreenCapture: 1 - wiiUControllerCount: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -95,31 +80,24 @@ PlayerSettings: metroEnableIndependentInputSource: 0 metroEnableLowLatencyPresentationAPI: 0 xboxOneDisableKinectGpuReservation: 0 - virtualRealitySupported: 0 - productGUID: f5ffb3c7a3a1aec4eba2fa702f0b6ea0 + productGUID: 00743736216db444bb88ba6d1404240b AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 AndroidPreferredInstallLocation: 1 aotOptions: apiCompatibilityLevel: 2 - stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 - iPhoneBuildNumber: 0 ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 preloadShaders: 0 StripUnusedMeshComponents: 0 - VertexChannelCompressionMask: - serializedVersion: 2 - m_Bits: 238 iPhoneSdkVersion: 988 iPhoneTargetOSVersion: 22 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 - uIRequiresFullScreen: 1 uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 @@ -133,31 +111,16 @@ PlayerSettings: iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} - appleTVSplashScreen: {fileID: 0} - tvOSSmallIconLayers: [] - tvOSLargeIconLayers: [] - tvOSTopShelfImageLayers: [] iOSLaunchScreenType: 0 iOSLaunchScreenPortrait: {fileID: 0} iOSLaunchScreenLandscape: {fileID: 0} iOSLaunchScreenBackgroundColor: serializedVersion: 2 rgba: 0 - iOSLaunchScreenFillPct: 100 - iOSLaunchScreenSize: 100 + iOSLaunchScreenFillPct: 1 iOSLaunchScreenCustomXibPath: - iOSLaunchScreeniPadType: 0 - iOSLaunchScreeniPadImage: {fileID: 0} - iOSLaunchScreeniPadBackgroundColor: - serializedVersion: 2 - rgba: 0 - iOSLaunchScreeniPadFillPct: 100 - iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: - iOSDeviceRequirements: [] AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 - androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: AndroidTVCompatibility: 1 @@ -167,36 +130,11 @@ PlayerSettings: - width: 320 height: 180 banner: {fileID: 0} - androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} - m_BuildTargetIcons: - - m_BuildTarget: - m_Icons: - - serializedVersion: 2 - m_Icon: {fileID: 0} - m_Width: 128 - m_Height: 128 + m_BuildTargetIcons: [] m_BuildTargetBatching: [] - m_BuildTargetGraphicsAPIs: [] webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} - wiiUTitleID: 0005000011000000 - wiiUGroupID: 00010000 - wiiUCommonSaveSize: 4096 - wiiUAccountSaveSize: 2048 - wiiUOlvAccessKey: 0 - wiiUTinCode: 0 - wiiUJoinGameId: 0 - wiiUJoinGameModeMask: 0000000000000000 - wiiUCommonBossSize: 0 - wiiUAccountBossSize: 0 - wiiUAddOnUniqueIDs: [] - wiiUMainThreadStackSize: 3072 - wiiULoaderThreadStackSize: 1024 - wiiUSystemHeapSize: 128 - wiiUTVStartupScreen: {fileID: 0} - wiiUGamePadStartupScreen: {fileID: 0} - wiiUProfilerLibPath: actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 @@ -247,46 +185,26 @@ PlayerSettings: ps4BackgroundImagePath: ps4StartupImagePath: ps4SaveDataImagePath: - ps4SdkOverride: ps4BGMPath: ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: ps4EnterButtonAssignment: 1 ps4ApplicationParam1: 0 ps4ApplicationParam2: 0 ps4ApplicationParam3: 0 ps4ApplicationParam4: 0 - ps4DownloadDataSize: 0 - ps4GarlicHeapSize: 2048 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 - ps4ReprojectionSupport: 0 - ps4UseAudio3dBackend: 0 - ps4SocialScreenEnabled: 0 - ps4Audio3dVirtualSpeakerCount: 14 - ps4attribCpuUsage: 0 - ps4PatchPkgPath: - ps4PatchLatestPkgPath: - ps4PatchChangeinfoPath: - ps4attribUserManagement: 0 - ps4attribMoveSupport: 0 - ps4attrib3DSupport: 0 - ps4attribShareSupport: 0 - ps4IncludedModules: [] monoEnv: psp2Splashimage: {fileID: 0} psp2NPTrophyPackPath: psp2NPSupportGBMorGJP: 0 psp2NPAgeRating: 12 - psp2NPTitleDatPath: psp2NPCommsID: psp2NPCommunicationsID: psp2NPCommsPassphrase: @@ -301,7 +219,6 @@ PlayerSettings: psp2PatchOriginalPackage: psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui psp2KeystoneFile: - psp2MemoryExpansionMode: 0 psp2DRMType: 0 psp2StorageType: 0 psp2MediaCapacity: 0 @@ -331,15 +248,56 @@ PlayerSettings: psmSplashimage: {fileID: 0} spritePackerPolicy: scriptingDefineSymbols: {} - metroPackageName: BitmapFontImporter + metroPackageName: Unity-BitmapFontImporter + metroPackageLogo: + metroPackageLogo140: + metroPackageLogo180: + metroPackageLogo240: metroPackageVersion: metroCertificatePath: metroCertificatePassword: metroCertificateSubject: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: BitmapFontImporter - wsaImages: {} + metroApplicationDescription: Unity-BitmapFontImporter + metroStoreTileLogo80: + metroStoreTileLogo: + metroStoreTileLogo140: + metroStoreTileLogo180: + metroStoreTileWideLogo80: + metroStoreTileWideLogo: + metroStoreTileWideLogo140: + metroStoreTileWideLogo180: + metroStoreTileSmallLogo80: + metroStoreTileSmallLogo: + metroStoreTileSmallLogo140: + metroStoreTileSmallLogo180: + metroStoreSmallTile80: + metroStoreSmallTile: + metroStoreSmallTile140: + metroStoreSmallTile180: + metroStoreLargeTile80: + metroStoreLargeTile: + metroStoreLargeTile140: + metroStoreLargeTile180: + metroStoreSplashScreenImage: + metroStoreSplashScreenImage140: + metroStoreSplashScreenImage180: + metroPhoneAppIcon: + metroPhoneAppIcon140: + metroPhoneAppIcon240: + metroPhoneSmallTile: + metroPhoneSmallTile140: + metroPhoneSmallTile240: + metroPhoneMediumTile: + metroPhoneMediumTile140: + metroPhoneMediumTile240: + metroPhoneWideTile: + metroPhoneWideTile140: + metroPhoneWideTile240: + metroPhoneSplashScreenImage: + metroPhoneSplashScreenImage140: + metroPhoneSplashScreenImage240: metroTileShortName: metroCommandLineArgsFile: metroTileShowName: 0 @@ -376,20 +334,10 @@ PlayerSettings: blackberrySquareSplashScreen: {fileID: 0} tizenProductDescription: tizenProductURL: - tizenSigningProfileName: + tizenCertificatePath: + tizenCertificatePassword: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 - n3dsUseExtSaveData: 0 - n3dsCompressStaticMem: 1 - n3dsExtSaveDataNumber: 0x12345 - n3dsStackSize: 131072 - n3dsTargetPlatform: 2 - n3dsRegion: 7 - n3dsMediaSize: 0 - n3dsLogoStyle: 3 - n3dsTitle: GameName - n3dsProductCode: - n3dsApplicationId: 0xFF3FF stvDeviceAddress: stvProductDescription: stvProductAuthor: @@ -406,7 +354,6 @@ PlayerSettings: XboxOnePackagingOverridePath: XboxOneAppManifestOverridePath: XboxOnePackageEncryption: 0 - XboxOnePackageUpdateGranularity: 2 XboxOneDescription: XboxOneIsContentPackage: 0 XboxOneEnableGPUVariability: 0 @@ -415,47 +362,30 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 intPropertyNames: - - Android::ScriptingBackend - Metro::ScriptingBackend - - Standalone::ScriptingBackend - WP8::ScriptingBackend - WebGL::ScriptingBackend - WebGL::audioCompressionFormat - WebGL::exceptionSupport - WebGL::memorySize - - WebPlayer::ScriptingBackend - iOS::Architecture - - iOS::EnableIncrementalBuildSupportForIl2cpp - iOS::ScriptingBackend - Android::ScriptingBackend: 0 Metro::ScriptingBackend: 2 - Standalone::ScriptingBackend: 0 WP8::ScriptingBackend: 2 WebGL::ScriptingBackend: 1 WebGL::audioCompressionFormat: 4 - WebGL::exceptionSupport: 1 + WebGL::exceptionSupport: 0 WebGL::memorySize: 256 - WebPlayer::ScriptingBackend: 0 iOS::Architecture: 2 - iOS::EnableIncrementalBuildSupportForIl2cpp: 1 - iOS::ScriptingBackend: 1 + iOS::ScriptingBackend: 0 boolPropertyNames: - - WebGL::analyzeBuildSize - WebGL::dataCaching - - WebGL::useEmbeddedResources - XboxOne::enus - WebGL::analyzeBuildSize: 0 WebGL::dataCaching: 0 - WebGL::useEmbeddedResources: 0 XboxOne::enus: 1 stringPropertyNames: - WebGL::emscriptenArgs - WebGL::template - - additionalIl2CppArgs::additionalIl2CppArgs WebGL::emscriptenArgs: WebGL::template: APPLICATION:Default - additionalIl2CppArgs::additionalIl2CppArgs: - cloudProjectId: - projectName: - organizationId: - cloudEnabled: 0 + firstStreamedLevelWithResources: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 558807b..b0ac510 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.3.5f1 +m_EditorVersion: 5.0.0f4 m_StandardAssetsVersion: 0 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 2282260..60b0053 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -14,7 +14,6 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 15 - shadowNearPlaneOffset: 2 shadowCascade2Split: .333333343 shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} blendWeights: 1 @@ -38,7 +37,6 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 20 - shadowNearPlaneOffset: 2 shadowCascade2Split: .333333343 shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} blendWeights: 2 @@ -62,7 +60,6 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 20 - shadowNearPlaneOffset: 2 shadowCascade2Split: .333333343 shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} blendWeights: 2 @@ -86,7 +83,6 @@ QualitySettings: shadowProjection: 1 shadowCascades: 2 shadowDistance: 40 - shadowNearPlaneOffset: 2 shadowCascade2Split: .333333343 shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} blendWeights: 2 @@ -110,7 +106,6 @@ QualitySettings: shadowProjection: 1 shadowCascades: 2 shadowDistance: 70 - shadowNearPlaneOffset: 2 shadowCascade2Split: .333333343 shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} blendWeights: 4 @@ -134,7 +129,6 @@ QualitySettings: shadowProjection: 1 shadowCascades: 4 shadowDistance: 150 - shadowNearPlaneOffset: 2 shadowCascade2Split: .333333343 shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} blendWeights: 4 @@ -154,18 +148,16 @@ QualitySettings: Android: 2 BlackBerry: 2 GLES Emulation: 5 - Nintendo 3DS: 5 PS3: 5 PS4: 5 PSM: 5 - PSP2: 2 + PSP2: 5 Samsung TV: 2 Standalone: 5 Tizen: 2 WP8: 5 Web: 5 WebGL: 3 - Wii U: 5 Windows Store Apps: 5 XBOX360: 5 XboxOne: 5 diff --git a/ProjectSettings/UnityAdsSettings.asset b/ProjectSettings/UnityAdsSettings.asset deleted file mode 100644 index 224050c..0000000 --- a/ProjectSettings/UnityAdsSettings.asset +++ /dev/null @@ -1,11 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!292 &1 -UnityAdsSettings: - m_ObjectHideFlags: 0 - m_Enabled: 0 - m_InitializeOnStartup: 1 - m_TestMode: 0 - m_EnabledPlatforms: 4294967295 - m_IosGameId: - m_AndroidGameId: diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset deleted file mode 100644 index 9b7a578..0000000 --- a/ProjectSettings/UnityConnectSettings.asset +++ /dev/null @@ -1,14 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!310 &1 -UnityConnectSettings: - m_ObjectHideFlags: 0 - UnityPurchasingSettings: - m_Enabled: 0 - m_TestMode: 0 - UnityAnalyticsSettings: - m_Enabled: 0 - m_InitializeOnStartup: 1 - m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: