Merge branch 'develop' into tr/publish

熊润斐
2 parents 2f148e9e 9fe9f3d1
Showing 5 changed files with 5 additions and 4 deletions Show diff stats
config/develop.lua
src/actions/HeroAction.lua
src/adv/AdvBattle.lua
src/csvdata
src/models/Activity.lua
@@ -2,7 +2,7 @@ include(&quot;basic.lua&quot;)
  
 logd = 0 -- 是否开启日志
 thread = 4
-codeurl = "192.168.8.223:9090"
+codeurl = "192.168.0.199:9090"
 servId = 1
  
 max_client = 64
@@ -738,7 +738,7 @@ function _M.drawHeroRpc(agent, data)
  
 	if btype == 1 then
 		-- 判断定向卡池活动开启
-		if not role.activity:isOpen("RaceDraw") then
+		if not role.activity:isOpen("SsrUpPoolChange") then
 			return
 		end
 	end
@@ -76,6 +76,7 @@ function Battle:initPlayer()
 		end
 		player.exp = 0
 		player.sp = getAdvLvAttrUp(advAddAttrs, "sp", 100)
+		player.spMax = player.sp
 		player.growth = {}
 		player.passives = {}
  
-Subproject commit d2c3deaddd4952cd4b05306144cbcdfa09734cd3
+Subproject commit e97f773db5d87e95086840cf48cd01b17ec8fc27
@@ -18,7 +18,7 @@ Activity.ActivityType = {
 	DrawHero = 12,	--抽卡周 招募
 	AdvDraw = 13,	--拾荒抽周 资助
 	OpenBox = 14,	--拆解周 时钟箱
-	RaceDraw = 15,  -- 定向招募活动
+	--RaceDraw = 15,  -- 定向招募活动
 }