Changeset 6681 for 2015


Ignore:
Timestamp:
2015-07-01 14:52:05 (4 years ago)
Author:
tasalmik
Message:
 
Location:
2015/27/TapaniS
Files:
52 added
12 edited

Legend:

Unmodified
Added
Removed
  • 2015/27/TapaniS/ProjectStar/ProjectStar/ProjectStar/ProjectStar.cs

    r6660 r6681  
    99public class ProjectStar : PhysicsGame 
    1010{ 
     11    int kenttaNro = 1; 
    1112    IntMeter pisteLaskuri; 
    1213 
     
    3132        Reset(); 
    3233 
     34        //SeuraavaKentta(); 
    3335 
    3436    } 
     
    8082        Add(pisteNaytto); 
    8183        pisteNaytto.Title = "Pisteet"; 
     84        pisteLaskuri.MaxValue = Paloja(); 
     85        pisteLaskuri.UpperLimit += SeuraavaKentta; 
     86    } 
    8287 
    83  
     88    void SeuraavaKentta() 
     89    { 
     90        kenttaNro++; 
     91        Reset(); 
    8492    } 
    8593 
     
    8896        pisteLaskuri.Value++; 
    8997        piste.Destroy(); 
     98    } 
     99 
     100    int Paloja() 
     101    { 
     102        return 23 - 3 * kenttaNro; 
    90103    } 
    91104 
     
    129142        AddCollisionHandler(ukko, palkki, CollisionHandler.DestroyObject); 
    130143 
    131         for (int i = 0; i < 20; i++) 
     144         
     145 
     146        for (int i = 0; i < Paloja(); i++) 
    132147        { 
    133148            Vector kentanPiste = Level.GetRandomPosition(); 
     
    154169 
    155170        Level.Background.Image = taustaKuva; 
     171            
    156172        //Camera.ZoomToLevel(); 
    157173        Level.CreateBorders(1, 1, 2, 1.0, Color.Transparent); 
  • 2015/27/TapaniS/ProjectStar/ProjectStar/ProjectStar/ProjectStar.csproj.Debug.cachefile

    r6660 r6681  
    11Content\Kentta.xnb 
    2 Content\monttu.xnb 
    32Content\Pemppe2.xnb 
    43Content\pemppe3.xnb 
  • 2015/27/TapaniS/ProjectStar/ProjectStar/ProjectStar/obj/x86/Debug/ContentPipeline-{F977AF6D-8086-4A71-9FEE-75BE75429D56}.xml

    r6660 r6681  
    88      <Processor>TextureProcessor</Processor> 
    99      <Options>None</Options> 
    10       <Output>C:\Users\Kukkeli\Desktop\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\Kentta.xnb</Output> 
    11       <Time>0001-01-01T00:00:00</Time> 
    12     </Item> 
    13 <<<<<<< .mine 
    14     <Item> 
    15       <Source>monttu.jpg</Source> 
    16       <Name>monttu</Name> 
    17       <Importer>TextureImporter</Importer> 
    18       <Processor>TextureProcessor</Processor> 
    19       <Options>None</Options> 
    20       <Output>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\monttu.xnb</Output> 
    21       <Time>2015-06-30T09:57:38.8415095+03:00</Time> 
     10      <Output>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\Kentta.xnb</Output> 
     11      <Time>2015-06-30T09:54:01.4629095+03:00</Time> 
    2212    </Item> 
    2313    <Item> 
     
    8575    </Item> 
    8676    <BuildSuccessful>true</BuildSuccessful> 
    87 ======= 
    88     <BuildSuccessful>false</BuildSuccessful> 
    89 >>>>>>> .r6658 
    9077    <Settings> 
    9178      <ContentProjectGUID>{F977AF6D-8086-4A71-9FEE-75BE75429D56}</ContentProjectGUID> 
     
    9481      <BuildConfiguration>Debug</BuildConfiguration> 
    9582      <CompressContent>false</CompressContent> 
    96       <RootDirectory>C:\Users\Kukkeli\Desktop\TapaniS\ProjectStar\ProjectStar\ProjectStarContent\</RootDirectory> 
    97       <LoggerRootDirectory>C:\Users\Kukkeli\Desktop\TapaniS\ProjectStar\ProjectStar\ProjectStar\</LoggerRootDirectory> 
    98       <IntermediateDirectory>C:\Users\Kukkeli\Desktop\TapaniS\ProjectStar\ProjectStar\ProjectStar\obj\x86\Debug\</IntermediateDirectory> 
    99       <OutputDirectory>C:\Users\Kukkeli\Desktop\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\</OutputDirectory> 
     83      <RootDirectory>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStarContent\</RootDirectory> 
     84      <LoggerRootDirectory>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\</LoggerRootDirectory> 
     85      <IntermediateDirectory>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\obj\x86\Debug\</IntermediateDirectory> 
     86      <OutputDirectory>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\</OutputDirectory> 
    10087    </Settings> 
    10188    <Assemblies> 
    10289      <Assembly> 
    10390        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key> 
    104         <Value>2015-06-27T04:27:48+03:00</Value> 
     91        <Value>2014-11-26T00:23:34+02:00</Value> 
    10592      </Assembly> 
    10693      <Assembly> 
     
    130117      <Assembly> 
    131118        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key> 
    132         <Value>2015-06-27T04:27:48+03:00</Value> 
     119        <Value>2014-11-26T00:23:36+02:00</Value> 
    133120      </Assembly> 
    134121      <Assembly> 
    135         <Key>C:\WINDOWS\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key> 
    136         <Value>2015-06-29T11:09:01.1175605+03:00</Value> 
     122        <Key>C:\Windows\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key> 
     123        <Value>2014-04-23T00:22:29.3372049+03:00</Value> 
    137124      </Assembly> 
    138125    </Assemblies> 
  • 2015/27/TapaniS/ProjectStar/ProjectStar/ProjectStar/obj/x86/Debug/ProjectStar.csproj.FileListAbsolute.txt

    r6660 r6681  
    1616C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\obj\x86\Debug\ProjectStar.pdb 
    1717C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\Kentta.xnb 
    18 C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\monttu.xnb 
    1918C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\Pemppe2.xnb 
    2019C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\pemppe3.xnb 
  • 2015/27/TapaniS/ProjectStar/ProjectStar/ProjectStar/obj/x86/Debug/cachefile-{F977AF6D-8086-4A71-9FEE-75BE75429D56}-targetpath.txt

    r6660 r6681  
    11Content\Kentta.xnb 
    2 Content\monttu.xnb 
    32Content\Pemppe2.xnb 
    43Content\pemppe3.xnb 
Note: See TracChangeset for help on using the changeset viewer.