0.9.2:全局更新

Zframework/color.lua

@@ -1,4 +1,4 @@
-return{
+local color={
 	red={1,0,0},
 	green={0,1,0},
 	blue={.2,.2,1},
@@ -10,17 +10,21 @@ return{
 	lightRed={1,.5,.5},
 	lightGreen={.5,1,.5},
 	lightBlue={.6,.6,1},
-	lightYellow={1,1,.5},
-	lightMagenta={1,.5,1},
 	lightCyan={.5,1,1},
+	lightMagenta={1,.5,1},
+	lightYellow={1,1,.5},
+	lightPurple={.8,.4,1},
+	lightOrange={1,.7,.3},
 	lightGrey={.8,.8,.8},
 
 	darkRed={.6,0,0},
 	darkGreen={0,.6,0},
 	darkBlue={0,0,.6},
-	darkYellow={.6,.6,0},
-	darkMagenta={.6,0,.6},
 	darkCyan={0,.6,.6},
+	darkMagenta={.6,0,.6},
+	darkYellow={.6,.6,0},
+	darkPurple={.3,0,.6},
+	darkOrange={.6,.4,0},
 	darkGrey={.3,.3,.3},
 
 	black={0,0,0},
@@ -30,9 +34,26 @@ return{
 	water={0,1,.6},
 	bronze={.7,.4,0},
 	white={1,1,1},
-	lightOrange={1,.7,.3},
-	darkOrange={.6,.4,0},
 	purple={.5,0,1},
-	lightPurple={.8,.4,1},
-	darkPurple={.3,0,.6},
-}
+}
+
+color.lRed=		color.lightRed
+color.lGreen=	color.lightGreen
+color.lBlue=	color.lightBlue
+color.lCyan=	color.lightCyan
+color.lMagenta=	color.lightMagenta
+color.lYellow=	color.lightYellow
+color.lPurple=	color.lightPurple
+color.lOrange=	color.lightOrange
+color.lGrey=	color.lightGrey
+
+color.dRed=		color.darkRed
+color.dGreen=	color.darkGreen
+color.dBlue=	color.darkBlue
+color.dCyan=	color.darkCyan
+color.dMagenta=	color.darkMagenta
+color.dYellow=	color.darkYellow
+color.dPurple=	color.darkPurple
+color.dOrange=	color.darkOrange
+color.dGrey=	color.darkGrey
+return color