Changeset 12101 for code/branches/WorldMap_HS18/data

Timestamp:

Nov 14, 2018, 10:01:05 AM (6 years ago)

Author:

linggj

Message:

12

Location:

code/branches/WorldMap_HS18/data

Files:

• gui/layouts/CampaignMenu.layout (modified) (4 diffs)
• gui/scripts/CampaignMenu.lua (modified) (2 diffs)
• levels/NC_StoryModeLevel.oxw (modified) (1 diff)
• levels/StoryModeMap.oxw (modified) (1 diff)
• levels/StoryModeMapDev.oxw (modified) (2 diffs)
• levels/templates/StoryMode.oxt (modified) (1 diff)

code/branches/WorldMap_HS18/data/gui/layouts/CampaignMenu.layout

@@ -7 +7 @@
         <Property name="Area" value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
         <Property name="BackgroundEnabled" value="False" />
-        
+              
+        <Window name="ForwardText" type="MenuWidgets/Button">
+            <Property name="Text" value="Forward" />
+            <Property name="Visible" value="True" />
+            <Property name="Area" value="{{0.1,0},{0.6,0},{0.3,0},{0.65,0}}" />
+            <Event function="CampaignMenu.forwardButton_clicked" name="Clicked" />
+        </Window>
+
+        <Window name="ForwardButton" type="MenuWidgets/JuuButton">
+            <Property name="Visible" value="True" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.1,0},{0.75,0},{0.25,0},{0.95,0}}" />
+            <Event function="CampaignMenu.forwardButton_clicked" name="Clicked" />
+        </Window>
 
         <Window name="Mission1Text" type="MenuWidgets/Button">
@@ -15 +28 @@
             <Event function="CampaignMenu.Mission1Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission1Button" type="MenuWidgets/JuuButton">
             <Property name="Visible" value="False" />
@@ -29 +43 @@
             <Event function="CampaignMenu.Mission2Button_clicked" name="Clicked" />
         </Window>
+        
         <Window name="Mission2Button" type="MenuWidgets/JuuButton">
             <Property name="Visible" value="True" />
@@ -149 +164 @@
             <Event function="CampaignMenu.CampaignMenuBackButton_clicked" name="Clicked" />
         </Window>
+
+
         <Window name="CampaignMenuCongratulation" type="MenuWidgets/StaticText">
             <Property name="Text" value="Campaign Completed!!!" />

code/branches/WorldMap_HS18/data/gui/scripts/CampaignMenu.lua

@@ -75 +75 @@
 end
 
+function P.forwardButton_clicked(e)
+    P.loadMap()
+end
+
 function P.Mission1Button_clicked(e)
+    P.loadLevel(P.FindLevel(0))
+end
+function P.KeyPressed(e)
     P.loadLevel(P.FindLevel(0))
 end
@@ -116 +123 @@
 end
 
+function P.loadMap()
+    orxonox.execute("change Game  NC_StoryModeLevel")
+end
+
 function P.FindLevel(index)
     local filename = orxonox.LevelManager:getInstance():getCampaignMission(index)

code/branches/WorldMap_HS18/data/levels/NC_StoryModeLevel.oxw

@@ -1 @@
-a<LevelInfo
+<LevelInfo
  name = "NC StoryMode"
  description = "A level in which the Campaign Menu is defined, which opens other levels."

code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw

@@ -37 +37 @@
         
          <Model position="550,300,0" mesh="assff.mesh" scale=20  visible="true" orientation="-0.015,0.091,0.038,-0.995"/>
-               <Model position="600,370,0" mesh="Coordinates.mesh" scale=10 />
+        <Model position="600,370,0" mesh="Coordinates.mesh" scale=10 />
         <Billboard colour="1,1,0.05" position="600,370,-80"  material="Flares/lensflare" scale=4.5 />
        

code/branches/WorldMap_HS18/data/levels/StoryModeMapDev.oxw

@@ -38 +38 @@
          
         
-         <Model position="550,300,0" mesh="assff.mesh" scale=20  visible="true" orientation="-0.015,0.091,0.038,-0.995"/>
-               <Model position="600,370,0" mesh="Coordinates.mesh" scale=10 />
+        <Model position="550,300,0" mesh="assff.mesh" scale=20  visible="true" orientation="-0.015,0.091,0.038,-0.995"/>
+        <Model position="600,370,0" mesh="Coordinates.mesh" scale=10 />
         <Billboard colour="1,1,0.05" position="600,370,-80"  material="Flares/lensflare" scale=4.5 />
        
@@ -77 +77 @@
     </templates>
     <controller>
-        <StoryModeController accuracy=10 team=3>
-            <waypoints>
-                <Model mesh="cube.mesh" scale=8 position="100,350,-250" />
-                <Model mesh="cube.mesh" scale=8 position="-900,-400,-1000" />
-                <Model mesh="cube.mesh" scale=8 position="0,500,0" />
-                <StaticEntity position="0,0,0" />
-            </waypoints>
-        </StoryModeController>
+        
     </controller>
 </SpaceShip>
-
 
 

code/branches/WorldMap_HS18/data/levels/templates/StoryMode.oxt

@@ -1 +1 @@
 <Template name=StoryMode>
-  <Pawn
+  <StoryModeController
    hudtemplate            = StoryModeMap
   />