zhanwencai 1 рік тому
батько
коміт
046fb90a8c

BIN
script/file3.tar.gz


+ 2 - 0
script/module/hero/HeroGrid.lua

@@ -85,6 +85,7 @@ function getCacheHeroGrid(id, star, others)
 		local grid = createHeroGrid(id, star)
 		local grid = createHeroGrid(id, star)
         if others then
         if others then
 		   grid.lv = others.lv and others.lv or grid.lv
 		   grid.lv = others.lv and others.lv or grid.lv
+		   grid.xLv = others.xLv and others.xLv or grid.xLv
 		   grid.quality = others.quality and others.quality or grid.quality
 		   grid.quality = others.quality and others.quality or grid.quality
            grid.star = others.star and others.star or grid.star
            grid.star = others.star and others.star or grid.star
         end
         end
@@ -225,6 +226,7 @@ function makeHeroSimple(net, grid, index, human, others, tuJian)
 	net.up =  upStarConfig == nil and 0 or 1 --是否能够升星
 	net.up =  upStarConfig == nil and 0 or 1 --是否能够升星
 
 
 	net.lv = others and others.lv or (grid and grid.lv or 1)
 	net.lv = others and others.lv or (grid and grid.lv or 1)
+	net.xLv = others and others.xLv or (grid and grid.xLv or 0)
 	net.zhandouli = grid and grid.zhandouli or 0
 	net.zhandouli = grid and grid.zhandouli or 0
 	net.quality = grid and grid.quality or 0
 	net.quality = grid and grid.quality or 0
 	net.isLock = (grid and grid.isLock) and 1 or 0
 	net.isLock = (grid and grid.isLock) and 1 or 0

+ 1 - 1
script/module/hero/Proto.lua

@@ -60,7 +60,7 @@ HeroSimple = {
     {"uuid",        1,      "string"},   --唯一标识
     {"uuid",        1,      "string"},   --唯一标识
 	{"icon",        1,      "int"},   	 --头像
 	{"icon",        1,      "int"},   	 --头像
 	{"lv",          1,      "short"},	 --等级:初始为1
 	{"lv",          1,      "short"},	 --等级:初始为1
-    {"xLx",        1,      "int"},   	 --xLv 初始值0
+    {"xLv",        1,      "int"},   	 --xLv 初始值0
 	{"camp",        1,      "byte"},	 --阵营
 	{"camp",        1,      "byte"},	 --阵营
 	{"job",         1,      "byte"},     --职业
 	{"job",         1,      "byte"},     --职业
 	{"zhandouli",   1,      "double"},   --战斗力
 	{"zhandouli",   1,      "double"},   --战斗力