Changeset 6741


Ignore:
Timestamp:
2015-07-02 13:02:32 (4 years ago)
Author:
saraivio
Message:

Suunnillen valmis peli. Bomb Squad.

Location:
2015/27/SampoR/Pommipeli
Files:
6 added
11 edited

Legend:

Unmodified
Added
Removed
  • 2015/27/SampoR/Pommipeli/Pommipeli/Pommipeli/Pommipeli.cs

    r6723 r6741  
    3232    void AlkuValikko() 
    3333    { 
     34        MediaPlayer.Play("Survival"); 
     35        MediaPlayer.IsRepeating = true; 
    3436        MultiSelectWindow alkuValikko = new MultiSelectWindow ( 
    3537       "Pelin alkuvalikko","Aloita peli", "Lopeta"); 
     
    4446    { 
    4547        ClearAll(); 
     48        MediaPlayer.Play("NeverGo"); 
     49        MediaPlayer.IsRepeating = true; 
    4650        pisteLaskuri.Value = 0; 
     51        pisteLaskuri.MaxValue = 0; 
    4752        IsPaused = false; 
    4853        Gravity = new Vector(0, -1000); 
     
    159164        Add(räjähdys); 
    160165        pommi.Destroy(); 
    161         if (pisteLaskuri > 18) 
    162  
    163         { 
    164             IsPaused = true; 
    165             AlkuValikko(); 
    166         } 
     166        //if (pisteLaskuri.Value > 18) 
     167 
     168        //{ 
     169             
     170        //    Timer.SingleShot(0.3, delegate  
     171        //    { 
     172        //        IsPaused = true; 
     173        //        AlkuValikko(); 
     174        //    }); 
     175        //} 
    167176    } 
    168177 
    169178    void AmmuAseella(AssaultRifle ase) 
     179 
    170180    { 
    171181 
     
    188198    void LuoPistelaskuri() 
    189199    { 
    190         pisteLaskuri.UpperLimit += Exit; 
     200        //pisteLaskuri.MaxValue = 19; 
     201        pisteLaskuri.UpperLimit += delegate 
     202        { 
     203            Timer.SingleShot(0.3, delegate 
     204            { 
     205                IsPaused = true; 
     206                AlkuValikko(); 
     207            }); 
     208        }; 
    191209 
    192210        Label pisteNaytto = new Label(); 
     
    207225        Add(räjähdys); 
    208226        pommi.Destroy(); 
    209  
    210         PelaajaKuolee(); 
     227        Timer.SingleShot(0.2, PelaajaKuolee); 
    211228    } 
    212229 
  • 2015/27/SampoR/Pommipeli/Pommipeli/Pommipeli/Pommipeli.csproj.Debug.cachefile

    r6654 r6741  
    55Content\kentta1.xnb 
    66Content\Vihollinen.xnb 
     7Content\NeverGo.xnb 
     8Content\Survival.xnb 
     9Content\NeverGo.wma 
     10Content\Survival.wma 
  • 2015/27/SampoR/Pommipeli/Pommipeli/Pommipeli/obj/x86/Debug/ContentPipeline-{E66DD545-885E-4E0E-8EF2-6E1200871AC7}.xml

    r6688 r6741  
    5656      <Time>2015-07-01T11:42:51.9715209+03:00</Time> 
    5757    </Item> 
     58    <Item> 
     59      <Source>NeverGo.mp3</Source> 
     60      <Name>NeverGo</Name> 
     61      <Importer>Mp3Importer</Importer> 
     62      <Processor>SongProcessor</Processor> 
     63      <Options>None</Options> 
     64      <Output>C:\MyTemp\SampoR\Pommipeli\Pommipeli\Pommipeli\bin\x86\Debug\Content\NeverGo.xnb</Output> 
     65      <Extra>C:\MyTemp\SampoR\Pommipeli\Pommipeli\Pommipeli\bin\x86\Debug\Content\NeverGo.wma</Extra> 
     66      <Time>2015-07-02T12:41:43.0583783+03:00</Time> 
     67    </Item> 
     68    <Item> 
     69      <Source>Survival.mp3</Source> 
     70      <Name>Survival</Name> 
     71      <Importer>Mp3Importer</Importer> 
     72      <Processor>SongProcessor</Processor> 
     73      <Options>None</Options> 
     74      <Output>C:\MyTemp\SampoR\Pommipeli\Pommipeli\Pommipeli\bin\x86\Debug\Content\Survival.xnb</Output> 
     75      <Extra>C:\MyTemp\SampoR\Pommipeli\Pommipeli\Pommipeli\bin\x86\Debug\Content\Survival.wma</Extra> 
     76      <Time>2015-07-02T12:53:37.1502743+03:00</Time> 
     77    </Item> 
    5878    <BuildSuccessful>true</BuildSuccessful> 
    5979    <Settings> 
  • 2015/27/SampoR/Pommipeli/Pommipeli/Pommipeli/obj/x86/Debug/Pommipeli.csproj.FileListAbsolute.txt

    r6654 r6741  
    1313C:\MyTemp\SampoR\Pommipeli\Pommipeli\Pommipeli\bin\x86\Debug\Content\sotilas.xnb 
    1414C:\MyTemp\SampoR\Pommipeli\Pommipeli\Pommipeli\bin\x86\Debug\Content\Vihollinen.xnb 
     15C:\MyTemp\SampoR\Pommipeli\Pommipeli\Pommipeli\bin\x86\Debug\Content\NeverGo.xnb 
     16C:\MyTemp\SampoR\Pommipeli\Pommipeli\Pommipeli\bin\x86\Debug\Content\NeverGo.wma 
     17C:\MyTemp\SampoR\Pommipeli\Pommipeli\Pommipeli\bin\x86\Debug\Content\Survival.xnb 
     18C:\MyTemp\SampoR\Pommipeli\Pommipeli\Pommipeli\bin\x86\Debug\Content\Survival.wma 
  • 2015/27/SampoR/Pommipeli/Pommipeli/Pommipeli/obj/x86/Debug/cachefile-{E66DD545-885E-4E0E-8EF2-6E1200871AC7}-targetpath.txt

    r6654 r6741  
    55Content\kentta1.xnb 
    66Content\Vihollinen.xnb 
     7Content\NeverGo.xnb 
     8Content\NeverGo.wma 
     9Content\Survival.xnb 
     10Content\Survival.wma 
  • 2015/27/SampoR/Pommipeli/Pommipeli/PommipeliContent/PommipeliContent.contentproj

    r6654 r6741  
    8383    </Compile> 
    8484  </ItemGroup> 
     85  <ItemGroup> 
     86    <Compile Include="NeverGo.mp3"> 
     87      <Name>NeverGo</Name> 
     88      <Importer>Mp3Importer</Importer> 
     89      <Processor>SongProcessor</Processor> 
     90    </Compile> 
     91  </ItemGroup> 
     92  <ItemGroup> 
     93    <Compile Include="Survival.mp3"> 
     94      <Name>Survival</Name> 
     95      <Importer>Mp3Importer</Importer> 
     96      <Processor>SongProcessor</Processor> 
     97    </Compile> 
     98  </ItemGroup> 
    8599  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    86100  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  
Note: See TracChangeset for help on using the changeset viewer.