Changeset 7116 for 2015/koodauskerho


Ignore:
Timestamp:
2016-01-16 14:59:20 (4 years ago)
Author:
otjojunt
Message:
 
Location:
2015/koodauskerho/AarniAR/StickmansGunFight
Files:
2 added
12 edited

Legend:

Unmodified
Added
Removed
  • 2015/koodauskerho/AarniAR/StickmansGunFight/StickmansGunFight/StickmansGunFight/Pelaaja.cs

    r7083 r7116  
    99    class Pelaaja : PlatformCharacter 
    1010    { 
    11         private IntMeter elamaLaskuri = new IntMeter(10, 0, 10); 
     11        private IntMeter elamaLaskuri = new IntMeter(15, 0, 15); 
    1212        public IntMeter ElamaLaskuri { get { return elamaLaskuri; } } 
    1313         
  • 2015/koodauskerho/AarniAR/StickmansGunFight/StickmansGunFight/StickmansGunFight/StickmansGunFight.cs

    r7093 r7116  
    5959    void LuoKentta() 
    6060    { 
    61         TileMap kentta = TileMap.FromLevelAsset("kentta1"); 
     61        TileMap kentta = TileMap.FromLevelAsset("kentta2"); 
    6262        kentta.SetTileMethod('#', LisaaTaso); 
    6363        kentta.SetTileMethod('*', LisaaTahti); 
     
    168168        ControllerOne.Listen(Button.DPadRight, ButtonState.Down, Liikuta, "Pelaaja liikkuu oikealle", pelaaja1, nopeus); 
    169169        ControllerOne.Listen(Button.B, ButtonState.Pressed, Hyppaa, "Pelaaja hyppää", pelaaja1, hyppyNopeus); 
    170         ControllerOne.Listen(Button.A, ButtonState.Pressed, AmmuAseella, "Pelaaja Ampuu", pelaaja1); 
     170        ControllerOne.Listen(Button.A, ButtonState.Down, AmmuAseella, "Pelaaja Ampuu", pelaaja1); 
    171171 
    172172        ControllerTwo.Listen(Button.DPadLeft, ButtonState.Down, Liikuta, "P2Liikkuu vasemmalle", pelaaja2, -nopeus); 
    173173        ControllerTwo.Listen(Button.DPadRight, ButtonState.Down, Liikuta, "P2Liikkuu oikealle", pelaaja2, nopeus); 
    174174        ControllerTwo.Listen(Button.B, ButtonState.Pressed, Hyppaa, "Pelaaja2 hyppää", pelaaja2, hyppyNopeus); 
    175         ControllerTwo.Listen(Button.A, ButtonState.Pressed, AmmuAseella, "P2 Ampuu", pelaaja2); 
     175        ControllerTwo.Listen(Button.A, ButtonState.Down, AmmuAseella, "P2 Ampuu", pelaaja2); 
    176176 
    177177        PhoneBackButton.Listen(ConfirmExit, "Lopeta peli"); 
     
    218218        if (ammus != null) 
    219219        { 
    220             //ammus.Size *= 3; 
     220            ammus.Size *= 1; 
    221221            //ammus.Image = ... 
    222             //ammus.MaximumLifetime = TimeSpan.FromSeconds(2.0); 
     222            ammus.MaximumLifetime = TimeSpan.FromSeconds(0.5); 
    223223 
    224224            ammus.Tag = "ammus"; 
  • 2015/koodauskerho/AarniAR/StickmansGunFight/StickmansGunFight/StickmansGunFight/StickmansGunFight.csproj.Debug.cachefile

    r7093 r7116  
    1010Content\StickmanAnewrun1.xnb 
    1111Content\StickmanAnewrun2.xnb 
    12 Content\kentta1.xnb 
    1312Content\AmmoBox.xnb 
    1413Content\HealthPack.xnb 
     14Content\wall-right.xnb 
     15Content\wall-left.xnb 
    1516Content\ground.xnb 
    1617Content\top.xnb 
    17 Content\wall-left.xnb 
    18 Content\wall-right.xnb 
     18Content\kentta1.xnb 
     19Content\kentta2.xnb 
  • 2015/koodauskerho/AarniAR/StickmansGunFight/StickmansGunFight/StickmansGunFight/obj/x86/Debug/ContentPipeline-{FB1067CC-FEED-45F1-8CB8-8F3DD59AB260}.xml

    r7093 r7116  
    99      <Options>None</Options> 
    1010      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\maali.xnb</Output> 
    11       <Time>2015-12-12T10:10:54.6201179+02:00</Time> 
     11      <Time>2016-01-16T10:35:52.688758+02:00</Time> 
    1212    </Item> 
    1313    <Item> 
     
    1818      <Options>None</Options> 
    1919      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\norsu.xnb</Output> 
    20       <Time>2015-12-12T10:10:54.6825183+02:00</Time> 
     20      <Time>2016-01-16T10:35:52.717758+02:00</Time> 
    2121    </Item> 
    2222    <Item> 
     
    2727      <Options>None</Options> 
    2828      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\tahti.xnb</Output> 
    29       <Time>2015-12-12T10:10:54.7761189+02:00</Time> 
     29      <Time>2016-01-16T10:35:52.720758+02:00</Time> 
    3030    </Item> 
    3131    <Item> 
     
    3636      <Options>None</Options> 
    3737      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\StickmanA.xnb</Output> 
    38       <Time>2015-12-12T10:10:54.7761189+02:00</Time> 
     38      <Time>2016-01-16T10:35:52.727758+02:00</Time> 
    3939    </Item> 
    4040    <Item> 
     
    4545      <Options>None</Options> 
    4646      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\StickmanB.xnb</Output> 
    47       <Time>2015-12-12T10:10:54.7761189+02:00</Time> 
     47      <Time>2016-01-16T10:35:52.730758+02:00</Time> 
    4848    </Item> 
    4949    <Item> 
     
    5454      <Options>None</Options> 
    5555      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\StickmanBnew.xnb</Output> 
    56       <Time>2015-12-12T10:10:54.635718+02:00</Time> 
     56      <Time>2016-01-16T10:35:52.737758+02:00</Time> 
    5757    </Item> 
    5858    <Item> 
     
    6363      <Options>None</Options> 
    6464      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\StickmanAnew.xnb</Output> 
    65       <Time>2015-12-12T10:10:54.635718+02:00</Time> 
     65      <Time>2016-01-16T10:35:52.733758+02:00</Time> 
    6666    </Item> 
    6767    <Item> 
     
    7272      <Options>None</Options> 
    7373      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\StickmanBnewrun1.xnb</Output> 
    74       <Time>2015-12-12T10:10:54.791719+02:00</Time> 
     74      <Time>2016-01-16T10:35:52.856758+02:00</Time> 
    7575    </Item> 
    7676    <Item> 
     
    8181      <Options>None</Options> 
    8282      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\StickmanBnewrun2.xnb</Output> 
    83       <Time>2015-12-12T10:10:54.6201179+02:00</Time> 
     83      <Time>2016-01-16T10:35:52.682758+02:00</Time> 
    8484    </Item> 
    8585    <Item> 
     
    9090      <Options>None</Options> 
    9191      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\StickmanAnewrun1.xnb</Output> 
    92       <Time>2015-12-12T10:10:54.7761189+02:00</Time> 
     92      <Time>2016-01-16T10:35:52.852758+02:00</Time> 
    9393    </Item> 
    9494    <Item> 
     
    9999      <Options>None</Options> 
    100100      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\StickmanAnewrun2.xnb</Output> 
    101       <Time>2015-12-12T10:10:54.7761189+02:00</Time> 
     101      <Time>2016-01-16T10:35:52.860758+02:00</Time> 
     102    </Item> 
     103    <Item> 
     104      <Source>AmmoBox.png</Source> 
     105      <Name>AmmoBox</Name> 
     106      <Importer>TextureImporter</Importer> 
     107      <Processor>TextureProcessor</Processor> 
     108      <Options>None</Options> 
     109      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\AmmoBox.xnb</Output> 
     110      <Time>2016-01-16T10:35:52.699758+02:00</Time> 
     111    </Item> 
     112    <Item> 
     113      <Source>HealthPack.png</Source> 
     114      <Name>HealthPack</Name> 
     115      <Importer>TextureImporter</Importer> 
     116      <Processor>TextureProcessor</Processor> 
     117      <Options>None</Options> 
     118      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\HealthPack.xnb</Output> 
     119      <Time>2016-01-16T10:35:52.707758+02:00</Time> 
     120    </Item> 
     121    <Item> 
     122      <Source>wall-right.png</Source> 
     123      <Name>wall-right</Name> 
     124      <Importer>TextureImporter</Importer> 
     125      <Processor>TextureProcessor</Processor> 
     126      <Options>None</Options> 
     127      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\wall-right.xnb</Output> 
     128      <Time>2016-01-16T10:35:52.723758+02:00</Time> 
     129    </Item> 
     130    <Item> 
     131      <Source>wall-left.png</Source> 
     132      <Name>wall-left</Name> 
     133      <Importer>TextureImporter</Importer> 
     134      <Processor>TextureProcessor</Processor> 
     135      <Options>None</Options> 
     136      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\wall-left.xnb</Output> 
     137      <Time>2016-01-16T10:35:52.849758+02:00</Time> 
     138    </Item> 
     139    <Item> 
     140      <Source>ground.png</Source> 
     141      <Name>ground</Name> 
     142      <Importer>TextureImporter</Importer> 
     143      <Processor>TextureProcessor</Processor> 
     144      <Options>None</Options> 
     145      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\ground.xnb</Output> 
     146      <Time>2016-01-16T10:35:52.691758+02:00</Time> 
     147    </Item> 
     148    <Item> 
     149      <Source>top.png</Source> 
     150      <Name>top</Name> 
     151      <Importer>TextureImporter</Importer> 
     152      <Processor>TextureProcessor</Processor> 
     153      <Options>None</Options> 
     154      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\top.xnb</Output> 
     155      <Time>2016-01-16T10:35:52.696758+02:00</Time> 
    102156    </Item> 
    103157    <Item> 
     
    108162      <Options>None</Options> 
    109163      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\kentta1.xnb</Output> 
    110       <Time>2015-12-12T14:28:13.1127163+02:00</Time> 
    111     </Item> 
    112     <Item> 
    113       <Source>AmmoBox.png</Source> 
    114       <Name>AmmoBox</Name> 
    115       <Importer>TextureImporter</Importer> 
    116       <Processor>TextureProcessor</Processor> 
    117       <Options>None</Options> 
    118       <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\AmmoBox.xnb</Output> 
    119       <Time>2015-12-12T11:45:11.4028556+02:00</Time> 
    120     </Item> 
    121     <Item> 
    122       <Source>HealthPack.png</Source> 
    123       <Name>HealthPack</Name> 
    124       <Importer>TextureImporter</Importer> 
    125       <Processor>TextureProcessor</Processor> 
    126       <Options>None</Options> 
    127       <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\HealthPack.xnb</Output> 
    128       <Time>2015-12-12T13:26:57.2610534+02:00</Time> 
    129     </Item> 
    130     <Item> 
    131       <Source>ground.png</Source> 
    132       <Name>ground</Name> 
    133       <Importer>TextureImporter</Importer> 
    134       <Processor>TextureProcessor</Processor> 
    135       <Options>None</Options> 
    136       <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\ground.xnb</Output> 
    137       <Time>2015-12-12T13:58:41.644558+02:00</Time> 
    138     </Item> 
    139     <Item> 
    140       <Source>top.png</Source> 
    141       <Name>top</Name> 
    142       <Importer>TextureImporter</Importer> 
    143       <Processor>TextureProcessor</Processor> 
    144       <Options>None</Options> 
    145       <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\top.xnb</Output> 
    146       <Time>2015-12-12T13:58:58.3747253+02:00</Time> 
    147     </Item> 
    148     <Item> 
    149       <Source>wall-left.png</Source> 
    150       <Name>wall-left</Name> 
    151       <Importer>TextureImporter</Importer> 
    152       <Processor>TextureProcessor</Processor> 
    153       <Options>None</Options> 
    154       <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\wall-left.xnb</Output> 
    155       <Time>2015-12-12T13:58:34.2144837+02:00</Time> 
    156     </Item> 
    157     <Item> 
    158       <Source>wall-right.png</Source> 
    159       <Name>wall-right</Name> 
    160       <Importer>TextureImporter</Importer> 
    161       <Processor>TextureProcessor</Processor> 
    162       <Options>None</Options> 
    163       <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\wall-right.xnb</Output> 
    164       <Time>2015-12-12T13:58:26.8544101+02:00</Time> 
     164      <Time>2016-01-16T10:35:52.704758+02:00</Time> 
     165    </Item> 
     166    <Item> 
     167      <Source>kentta2.txt</Source> 
     168      <Name>kentta2</Name> 
     169      <Importer>TextFileImporter</Importer> 
     170      <Processor>TextFileContentProcessor</Processor> 
     171      <Options>None</Options> 
     172      <Output>C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\kentta2.xnb</Output> 
     173      <Time>2016-01-16T14:55:36.9539803+02:00</Time> 
    165174    </Item> 
    166175    <BuildSuccessful>true</BuildSuccessful> 
     
    211220      <Assembly> 
    212221        <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> 
    213         <Value>2015-09-16T18:38:09.4670874+03:00</Value> 
     222        <Value>2015-09-16T19:52:38.3293055+03:00</Value> 
    214223      </Assembly> 
    215224    </Assemblies> 
  • 2015/koodauskerho/AarniAR/StickmansGunFight/StickmansGunFight/StickmansGunFight/obj/x86/Debug/StickmansGunFight.csproj.FileListAbsolute.txt

    r7093 r7116  
    2525C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\wall-left.xnb 
    2626C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\wall-right.xnb 
     27C:\MyTemp\AarniAR\StickmansGunFight\StickmansGunFight\StickmansGunFight\bin\x86\Debug\Content\kentta2.xnb 
  • 2015/koodauskerho/AarniAR/StickmansGunFight/StickmansGunFight/StickmansGunFight/obj/x86/Debug/cachefile-{FB1067CC-FEED-45F1-8CB8-8F3DD59AB260}-targetpath.txt

    r7093 r7116  
    1010Content\StickmanAnewrun1.xnb 
    1111Content\StickmanAnewrun2.xnb 
    12 Content\kentta1.xnb 
    1312Content\AmmoBox.xnb 
    1413Content\HealthPack.xnb 
     14Content\wall-right.xnb 
     15Content\wall-left.xnb 
    1516Content\ground.xnb 
    1617Content\top.xnb 
    17 Content\wall-left.xnb 
    18 Content\wall-right.xnb 
     18Content\kentta1.xnb 
     19Content\kentta2.xnb 
  • 2015/koodauskerho/AarniAR/StickmansGunFight/StickmansGunFight/StickmansGunFightContent/StickmansGunFightContent.contentproj

    r7093 r7116  
    165165    </Compile> 
    166166  </ItemGroup> 
     167  <ItemGroup> 
     168    <Compile Include="kentta2.txt"> 
     169      <Name>kentta2</Name> 
     170      <Importer>TextFileImporter</Importer> 
     171      <Processor>TextFileContentProcessor</Processor> 
     172    </Compile> 
     173  </ItemGroup> 
    167174  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    168175  <!--  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.