Merge branch 'master' of github.com:liyonghelpme/codeOnNormal

Conflicts:
	root.py

Author: liyonghelpme

root.py

@@ -152,15 +152,15 @@ class RootController(BaseController):
 
     expanding=[[10000,1,10],[50000,3,20],[100000,5,50],[500000,7,90],[1000000,10,140],[1500000,15,200],[2000000,20,330],[2500000,27,580],[3000000,37,740],[5000000,50,920]]
     error = ErrorController()
-    EXPANDLEV=10
-    
-    randombuilding=[[1,1],[100,1],[103,5],[106,10],[109,15],[112,20],[300,1],[303,5],[309,10],[312,15],[318,20],[321,25],[500,1],[501,1],[502,1],[503,1],[505,1],[508,5],[509,5],[510,5],[511,5],[512,5],[513,5],[514,7],[515,8],[516,9],[519,13],[520,14],[521,15],[522,16],[523,17],[525,19],[526,19],[527,19],[528,19],[529,20],[530,20],[531,20],[536,22],[537,22],[538,22],[539,23],[541,24]]
-    
-    mapKind=[8,32,72,144,200,512,800]
-    
-    woods=[[600,5,20,4320,7],[1850,15,50,21600,10],[-4,20,70,6480,7],[1000,10,40,5400,15],[2500,20,80,25200,20],[-8,50,120,9000,7]]
-    
-    stones=[[1200,10,20,4320,10],[3600,20,50,21600,15],[-5,30,70,6480,10],[2000,15,40,5400,20],[5500,25,80,25200,25],[-10,65,120,9000,10]]
+    EXPANDLEV=10#最高等级 ，从0开始
+    #不使用randombuilding
+    randombuilding=[[1,1],[100,1],[103,5],[106,10],[109,15],[112,20],[300,1],[303,5],[309,10],[312,15],[318,20],[321,25],[500,1],[501,1],[502,1],[503,1],[505,1],[508,5],[509,5],[510,5],[511,5],[512,5],[513,5],[514,7],[515,8],[516,9],[519,13],[520,14],[521,15],[522,16],[523,17],[525,19],[526,19],[527,19],[528,19],[529,20],[530,20],[531,20],[536,22],[537,22],[538,22],[539,23],[541,24]]#building id, lev
+    #各爵位地图用户数
+    mapKind=[8,32,72,128,200,512,800]
+    #woods product cost(corn or cae),exp,gain,time，解锁等级
+    woods=[[600,5,20,4320,7],[1850,15,50,21600,10],[-4,20,70,6480,7],[1000,10,40,5400,15],[2500,20,80,25200,20],[-8,50,120,9000,7]]#woods product cost(corn or cae),exp,gain,time
+    #stones product cost(corn or cae),exp,gain,time，解锁等级
+    stones=[[1200,10,20,4320,10],[3600,20,50,21600,15],[-5,30,70,6480,10],[2000,15,40,5400,20],[5500,25,80,25200,25],[-10,65,120,9000,10]]#stones product cost(corn or cae),exp,gain,time
     alphabet=['a','b','c','d','e','f','g','h','i','j','k','l','m','n']
     allyup=[1,2,3,4,5,6,7]
     loginbonuslist=[3000,5000,8000,12000,-2]