Changeset 12101 for code/branches/WorldMap_HS18/data/gui

Timestamp:

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

Author:

linggj

Message:

12

Location:

code/branches/WorldMap_HS18/data/gui

Files:

• layouts/CampaignMenu.layout (modified) (4 diffs)
• scripts/CampaignMenu.lua (modified) (2 diffs)

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)