Changeset 1540 for 2010/23

Timestamp:

2010-08-02 18:44:15 (13 years ago)

Author:

hniemi

Message:

Highscoreslistaa lisätty, hieman kesken

Location:

2010/23/hniemi/JyTris/JyTris

Files:

• Content/Content.contentproj (modified) (2 diffs)
• Content/obj/x86/Debug/ContentPipeline.xml (modified) (2 diffs)
• Content/peliloppu.png (added)
• JyTris.csproj (modified) (1 diff)
• JyTris.csproj.Debug.cachefile (added)
• JyTris.suo (modified) (previous)
• Peli.cs (modified) (4 diffs)
• obj/x86/Debug/JyTris.csproj.FileListAbsolute.txt (modified) (1 diff)
• obj/x86/Debug/JyTris.exe (modified) (previous)
• obj/x86/Debug/JyTris.pdb (modified) (previous)
• obj/x86/Debug/cachefile-f4dc0895-798c-4bef-93d3-7d35766b520d-targetpath.txt (added)
• topten.dat (added)

2010/23/hniemi/JyTris/JyTris/Content/Content.contentproj

@@ -1 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectGuid>f4dc0895-798c-4bef-93d3-7d35766b520d</ProjectGuid>
@@ -34 +34 @@
     <Reference Include="Microsoft.Xna.Framework.Content.Pipeline.XImporter, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="peliloppu.png">
+      <Name>peliloppu</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
 </Project>

2010/23/hniemi/JyTris/JyTris/Content/obj/x86/Debug/ContentPipeline.xml

@@ -2 +2 @@
 <XnaContent xmlns:Pipeline="Microsoft.Xna.Framework.Content.Pipeline">
   <Asset Type="Pipeline:BuildItemCollection">
+    <Item>
+      <Source>peliloppu.png</Source>
+      <Name>peliloppu</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>D:\Projektit\JyTris\JyTris\bin\x86\Debug\Content\peliloppu.xnb</Output>
+      <Time>2010-08-02T18:00:33.4095377+03:00</Time>
+    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>
@@ -14 +23 @@
     <Assemblies>
       <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v3.1\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key>
+        <Value>2009-05-28T00:16:14+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v3.1\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key>
+        <Value>2009-05-28T00:16:06+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v3.1\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key>
+        <Value>2009-05-28T00:16:16+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v3.1\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key>
+        <Value>2009-05-28T00:16:26+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v3.1\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key>
+        <Value>2009-05-28T00:16:12+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v3.1\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key>
+        <Value>2009-05-28T00:16:06+03:00</Value>
+      </Assembly>
+      <Assembly>
         <Key>C:\Windows\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\3.1.0.0__6d5c3888ef60e27d\Microsoft.Xna.Framework.Content.Pipeline.dll</Key>
         <Value>2010-07-28T21:36:27.8906026+03:00</Value>

2010/23/hniemi/JyTris/JyTris/JyTris.csproj

@@ -130 +130 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="topten.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.targets" />

2010/23/hniemi/JyTris/JyTris/Peli.cs

@@ -33 +33 @@
 
         //Statistiikka
-        double vaikeusaste = 0.9 ;
+        double vaikeusaste = 0.9;
+        bool purkkabool = false;
         IntMeter pisteet = new IntMeter(0);
         IntMeter taso = new IntMeter(0);
         int tuhotutRivit = 0;
+        HighScoreList topLista;
 
         Label tasonaytto;
@@ -60 +62 @@
             AlkuIntro();
             AsetaMenuNappaimet();
+            AsetaPistelista();
             LuoHud();
+        }
+
+        public void AsetaPistelista()
+        {
+            topLista = HighScoreList.LoadOrCreate("topten.dat",10);
         }
 
@@ -450 +458 @@
             AsetaPeliNappaimet();
 
+            
+
+            if (purkkabool)
+            {
+                topLista.Hide();
+                purkkabool = false;
+            }
+
             vaikeusaste = 0.9;
             tiputusajastin = new Timer();
@@ -564 +580 @@
             tiputusajastin.Stop();
             status.Text = "Hävisit pelin!";
+            //status.Image = LoadImage("peliloppu");
             status.IsVisible = true;
+            topLista.Show(pisteet.Value);
+            purkkabool = true;
             ClearControls();
             AsetaMenuNappaimet();

2010/23/hniemi/JyTris/JyTris/obj/x86/Debug/JyTris.csproj.FileListAbsolute.txt

@@ -28 +28 @@
 C:\MyTemp\hniemi\JyTris\JyTris\obj\x86\Debug\JyTris.exe
 C:\MyTemp\hniemi\JyTris\JyTris\obj\x86\Debug\JyTris.pdb
+D:\Projektit\JyTris\JyTris\bin\x86\Debug\Content\peliloppu.xnb
+D:\Projektit\JyTris\JyTris\bin\x86\Debug\topten.dat