经验+操作

app/public/lang/default.json

@@ -573,7 +573,7 @@
 		"disable_note": "disable & invisible to anyone including myself",
 		"not_found": "not found",
 		"progress_curve": "progress curve",
-		"day_EXP": "Day EXP",
+		"day_EXP": "Daily EXP",
 		"Jan": "Jan",
 		"Feb": "Feb",
 		"Mar": "Mar",
@@ -587,6 +587,8 @@
 		"Nov": "Nov",
 		"Dec": "Dec",
 		"EXP_in_total": "EXP in total",
+		"day_action": "Daily Action",
+		"action": "Actions",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/en.json

@@ -572,7 +572,7 @@
 		"disable_note": "disable & invisible to anyone including myself",
 		"not_found": "not found",
 		"progress_curve": "progress curve",
-		"day_EXP": "Day EXP",
+		"day_EXP": "Daily EXP",
 		"Jan": "Jan",
 		"Feb": "Feb",
 		"Mar": "Mar",
@@ -586,6 +586,8 @@
 		"Nov": "Nov",
 		"Dec": "Dec",
 		"EXP_in_total": "EXP in total",
+		"day_action": "Daily Action",
+		"action": "Actions",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -572,7 +572,7 @@
 		"disable_note": "disable & invisible to anyone including myself",
 		"not_found": "not found",
 		"progress_curve": "progress curve",
-		"day_EXP": "Day EXP",
+		"day_EXP": "Daily EXP",
 		"Jan": "Jan",
 		"Feb": "Feb",
 		"Mar": "Mar",
@@ -586,6 +586,8 @@
 		"Nov": "Nov",
 		"Dec": "Dec",
 		"EXP_in_total": "EXP in total",
+		"day_action": "Daily Action",
+		"action": "Actions",
 		"": "",
 		"": ""
 	},

app/public/lang/si.json

@@ -577,7 +577,7 @@
 		"disable_note": "disable & invisible to anyone including myself",
 		"not_found": "not found",
 		"progress_curve": "progress curve",
-		"day_EXP": "Day EXP",
+		"day_EXP": "Daily EXP",
 		"Jan": "Jan",
 		"Feb": "Feb",
 		"Mar": "Mar",
@@ -591,6 +591,8 @@
 		"Nov": "Nov",
 		"Dec": "Dec",
 		"EXP_in_total": "EXP in total",
+		"day_action": "Daily Action",
+		"action": "Actions",
 		"": "",
 		"": ""
 	},

app/public/lang/zh-cn.json

@@ -589,7 +589,8 @@
 		"Nov": "十一月",
 		"Dec": "十二月",
 		"EXP_in_total": "总经验",
-
+		"day_action": "每日操作",
+		"action": "操作",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-tw.json

@@ -587,7 +587,9 @@
 		"Oct": "十月",
 		"Nov": "十一月",
 		"Dec": "十二月",
-		"EXP_in_total": "总经验",
+		"EXP_in_total": "總經驗",
+		"day_action": "每日操作",
+		"action": "操作",
 		"": ""
 	},
 	"grammastr": [

app/ucenter/active_get.php

@@ -23,7 +23,7 @@ if(isset($userid)){
 	$last = 0;
 	while($row = $sth->fetch(PDO::FETCH_ASSOC)){
 		$curr = $last+$row["duration"]/3600000;
-		$output[]=array($row["date"],number_format($last,3,".",""),number_format($curr,3,".",""),number_format($last,3,".",""),number_format($curr,3,".",""));
+		$output[]=array($row["date"],number_format($last,3,".",""),number_format($curr,3,".",""),number_format($last,3,".",""),number_format($curr,3,".",""),$row["hit"]);
 		$last = $curr;
 	}
 

app/uhome/foot_step.php

@@ -78,6 +78,34 @@ Highcharts.setOptions({
 });
 
   Highcharts.getJSON('../ucenter/active_get.php', function (data) {
+    var ohlc = [],
+        volume = [],
+        dataLength = data.length,
+        // set the allowed units for data grouping
+        groupingUnits = [[
+            'week',                         // unit name
+            [1]                             // allowed multiples
+        ], [
+            'month',
+            [1, 2, 3, 4, 6]
+        ]],
+
+        i = 0;
+
+    for (i; i < dataLength; i += 1) {
+        ohlc.push([
+            data[i][0], // the date
+            data[i][1], // open
+            data[i][2], // high
+            data[i][3], // low
+            data[i][4] // close
+        ]);
+
+        volume.push([
+            data[i][0], // the date
+            data[i][5] // the volume
+        ]);
+    }
 
   // create the chart
   Highcharts.stockChart('container', {
@@ -90,17 +118,55 @@ Highcharts.setOptions({
     title: {
       text: gLocal.gui.progress_curve
     },
+        yAxis: [{
+            labels: {
+                align: 'right',
+                x: -3
+            },
+            title: {
+                text: gLocal.gui.EXP
+            },
+            height: '60%',
+            lineWidth: 2,
+            resize: {
+                enabled: true
+            }
+        }, {
+            labels: {
+                align: 'right',
+                x: -3
+            },
+            title: {
+                text: gLocal.gui.action
+            },
+            top: '65%',
+            height: '35%',
+            offset: 0,
+            lineWidth: 2
+        }],
+
 	tooltip: {
-			shared: true,
+			shared: false,
 			useHTML: true,
-			pointFormatter: function() { return '<b>'+this.series.name + ' : ' + this.high + '&nbsp;' +gLocal.gui.h+ '<br>' +gLocal.gui.day_EXP + ' : ' + Math.round((this.high - this.low)*100)/100 + '&nbsp;' +gLocal.gui.h+'</b><br/>'; },
-			valueDecimals: 2
+			pointFormatter: function() {
+				if(this.high){
+					return '<b><a href="../">'+this.series.name + ' : ' + this.high + '&nbsp;' +gLocal.gui.h+ '</a><br><a href="../">' +gLocal.gui.day_EXP + ' : ' + Math.round((this.high - this.low)*100)/100 + '&nbsp;' +gLocal.gui.h+'</a></b><br/>'; 
+				}
+				else{
+					return '<b><a href="../">'+this.series.name + ' : ' + this.y + '&nbsp;' +gLocal.gui.times+'</a><span style="display:none;">'+this.x+'</span></b>'; 
+					
+				}
+
+			},
+			valueDecimals: 2,//保留两位小數
+            split: true
+
 		},
 
     series: [{
       type: 'ohlc',
       name: gLocal.gui.EXP_in_total,
-      data: data,
+      data: ohlc,
       dataGrouping: {
         units: [[
           'week', // unit name
@@ -110,7 +176,15 @@ Highcharts.setOptions({
           [1, 2, 3, 4, 6]
         ]]
       }
-    }]
+        }, {
+            type: 'column',
+            name: gLocal.gui.day_action,
+            data: volume,
+            yAxis: 1,
+            dataGrouping: {
+                units: groupingUnits
+            }
+        }]
   });
   });
 </script>